From 80ffa39f4f61801f63f7e7f818ef60f7bd391b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Conall=20=C3=93=20Cofaigh?= Date: Tue, 20 Aug 2024 13:10:39 +0100 Subject: [PATCH] refactor: move stack into "basic" directory (#9) --- ibm_catalog.json | 1 + .../catalogValidationValues.json.template | 0 .../basic/stack_definition.json | 0 tests/go.mod | 2 +- tests/go.sum | 8 ++++++++ tests/pr_test.go | 18 +++++++++++------- 6 files changed, 21 insertions(+), 8 deletions(-) rename catalogValidationValues.json.template => solutions/basic/catalogValidationValues.json.template (100%) rename stack_definition.json => solutions/basic/stack_definition.json (100%) diff --git a/ibm_catalog.json b/ibm_catalog.json index c31aba5..c643551 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -59,6 +59,7 @@ { "label": "Basic", "name": "basic", + "working_directory": "solutions/basic", "compliance": { "authority": "scc-v3", "profiles": [ diff --git a/catalogValidationValues.json.template b/solutions/basic/catalogValidationValues.json.template similarity index 100% rename from catalogValidationValues.json.template rename to solutions/basic/catalogValidationValues.json.template diff --git a/stack_definition.json b/solutions/basic/stack_definition.json similarity index 100% rename from stack_definition.json rename to solutions/basic/stack_definition.json diff --git a/tests/go.mod b/tests/go.mod index 787d661..2ee5ca0 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -5,6 +5,7 @@ go 1.22 toolchain go1.23.0 require ( + github.com/gruntwork-io/terratest v0.46.15 github.com/stretchr/testify v1.9.0 github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.37.1 ) @@ -64,7 +65,6 @@ require ( github.com/hashicorp/go-retryablehttp v0.7.7 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect github.com/googleapis/gax-go/v2 v2.11.0 // indirect - github.com/gruntwork-io/terratest v0.46.15 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-getter v1.7.4 // indirect diff --git a/tests/go.sum b/tests/go.sum index 6ac12f9..11d5ca6 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -123,6 +123,8 @@ github.com/go-playground/validator/v10 v10.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M= +github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -178,10 +180,13 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= +github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= +github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -221,6 +226,7 @@ github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8= github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= @@ -240,6 +246,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= diff --git a/tests/pr_test.go b/tests/pr_test.go index f7a59da..42eb3aa 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -34,13 +34,16 @@ func TestMain(m *testing.M) { os.Exit(m.Run()) } -func TestProjectsFullTest(t *testing.T) { +const basicDaStackDefPath = "solutions/basic/stack_definition.json" + +func TestProjectsBasicFullTest(t *testing.T) { t.Parallel() options := testprojects.TestProjectOptionsDefault(&testprojects.TestProjectsOptions{ - Testing: t, - Prefix: "rag-stack", - ParallelDeploy: true, + Testing: t, + Prefix: "rag-stack", + ParallelDeploy: true, + StackConfigurationPath: basicDaStackDefPath, }) privateKey, _, kerr := common.GenerateTempGPGKeyPairBase64() @@ -63,7 +66,7 @@ func TestProjectsFullTest(t *testing.T) { } } -func TestProjectsExistingResourcesTest(t *testing.T) { +func TestProjectsBasicExistingResourcesTest(t *testing.T) { // TODO: pipeline has issues with SM trial version, to unblock further Stack testing, disabling that test for now t.Skip() t.Parallel() @@ -109,8 +112,9 @@ func TestProjectsExistingResourcesTest(t *testing.T) { // ------------------------------------------------------------------------------------ options := testprojects.TestProjectOptionsDefault(&testprojects.TestProjectsOptions{ - Testing: t, - ParallelDeploy: true, + Testing: t, + ParallelDeploy: true, + StackConfigurationPath: basicDaStackDefPath, }) privateKey, _, kerr := common.GenerateTempGPGKeyPairBase64()