Skip to content

Commit 16e4640

Browse files
authored
fix: updated DA dependency descriptions (#83)
1 parent 42d087a commit 16e4640

File tree

4 files changed

+52
-5
lines changed

4 files changed

+52
-5
lines changed

ibm_catalog.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@
377377
},
378378
{
379379
"name": "deploy-arch-ibm-cloud-logs",
380-
"description": "Enable this to create an IBM Cloud Logs (ICL) Instance which can be used for storage and analysis of events ingested by Activity Tracker. ",
380+
"description": "Configure IBM Cloud Logs to analyse the platform logs.",
381381
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
382382
"flavors": [
383383
"fully-configurable"
@@ -409,7 +409,7 @@
409409
},
410410
{
411411
"name": "deploy-arch-ibm-cloud-monitoring",
412-
"description": "Enable IBM Cloud Monitoring to gain operational visibility into your cloud storage buckets. ",
412+
"description": "Configure IBM Cloud Monitoring to collect the platform metrics.",
413413
"id": "73debdbf-894f-4c14-81c7-5ece3a70b67d-global",
414414
"version": "v1.6.4",
415415
"flavors": [

tests/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.25.0
77
require (
88
github.com/gruntwork-io/terratest v0.50.0
99
github.com/stretchr/testify v1.11.1
10-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.1
10+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.3
1111
)
1212

1313
require (

tests/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
295295
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
296296
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
297297
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
298-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.1 h1:tcQG5sh+M4CGglqR221muoANVTXD01ZX7rIEURfw4ZM=
299-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.1/go.mod h1:QQiS4/GrSDsVuI1Jdw8MTLmBJv68QiVfuLpiM+e9rt0=
298+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.3 h1:eR7/W4+SmqfDfeD33ZVmtKrtM+KtcbAbURfjKAnXyic=
299+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.3/go.mod h1:9Thq3InVLYHEtKIVABm8e1d7jvpIQqlKCJ8/d5wH6DY=
300300
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
301301
github.com/tmccombs/hcl2json v0.6.4 h1:/FWnzS9JCuyZ4MNwrG4vMrFrzRgsWEOVi+1AyYUVLGw=
302302
github.com/tmccombs/hcl2json v0.6.4/go.mod h1:+ppKlIW3H5nsAsZddXPy2iMyvld3SHxyjswOZhavRDk=

tests/pr_test.go

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ import (
1515
"github.com/gruntwork-io/terratest/modules/terraform"
1616
"github.com/stretchr/testify/assert"
1717
"github.com/stretchr/testify/require"
18+
"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/cloudinfo"
1819
"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/common"
20+
"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testaddons"
1921
"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testhelper"
2022
"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testschematic"
2123
)
@@ -248,3 +250,48 @@ func TestRunAccountSettings(t *testing.T) {
248250
err := options.RunSchematicTest()
249251
assert.Nil(t, err, "This should not have errored")
250252
}
253+
254+
func TestActivityTrackerDefaultConfiguration(t *testing.T) {
255+
t.Parallel()
256+
257+
options := testaddons.TestAddonsOptionsDefault(&testaddons.TestAddonOptions{
258+
Testing: t,
259+
Prefix: "act-def",
260+
ResourceGroup: resourceGroup,
261+
QuietMode: true, // Suppress logs except on failure
262+
})
263+
264+
options.AddonConfig = cloudinfo.NewAddonConfigTerraform(
265+
options.Prefix,
266+
"deploy-arch-ibm-activity-tracker",
267+
"fully-configurable",
268+
map[string]interface{}{
269+
"prefix": options.Prefix,
270+
"region": validRegions[rand.Intn(len(validRegions))],
271+
},
272+
)
273+
274+
err := options.RunAddonTest()
275+
require.NoError(t, err)
276+
}
277+
278+
func TestActivityTrackerDependencyPermutations(t *testing.T) {
279+
t.Skip("Skipping dependency permutations until the test is fixed")
280+
t.Parallel()
281+
options := testaddons.TestAddonsOptionsDefault(&testaddons.TestAddonOptions{
282+
Testing: t,
283+
Prefix: "act-per",
284+
AddonConfig: cloudinfo.AddonConfig{
285+
OfferingName: "deploy-arch-ibm-activity-tracker",
286+
OfferingFlavor: "fully-configurable",
287+
Inputs: map[string]interface{}{
288+
"prefix": "act-per",
289+
"region": validRegions[rand.Intn(len(validRegions))],
290+
"existing_resource_group_name": resourceGroup,
291+
},
292+
},
293+
})
294+
295+
err := options.RunAddonPermutationTest()
296+
assert.NoError(t, err, "Dependency permutation test should not fail")
297+
}

0 commit comments

Comments
 (0)