From 28e7758d3b5e1f23438d4cd2195556f299dc7b9b Mon Sep 17 00:00:00 2001 From: akocbek Date: Thu, 26 Jun 2025 21:52:37 +0100 Subject: [PATCH 1/3] fix: do not run build run if builds are not passed in --- solutions/project/main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/solutions/project/main.tf b/solutions/project/main.tf index 624621a..cc4e1e2 100644 --- a/solutions/project/main.tf +++ b/solutions/project/main.tf @@ -91,6 +91,7 @@ module "build" { resource "terraform_data" "run_build" { depends_on = [module.build] + count = length(local.updated_builds) > 0 ? 1 : 0 provisioner "local-exec" { interpreter = ["/bin/bash", "-c"] From 24d5bb4ebe2f14ae8038250f42a6200253477ba0 Mon Sep 17 00:00:00 2001 From: akocbek Date: Thu, 26 Jun 2025 22:31:46 +0100 Subject: [PATCH 2/3] add simple test --- tests/pr_test.go | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/tests/pr_test.go b/tests/pr_test.go index d4403a0..509a03b 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -190,9 +190,10 @@ func TestUpgradeCEProjectDA(t *testing.T) { t.Parallel() options := testhelper.TestOptionsDefault(&testhelper.TestOptions{ - Testing: t, - TerraformDir: projectSolutionsDir, - Prefix: "ce-da", + Testing: t, + TerraformDir: projectSolutionsDir, + Prefix: "ce-da", + CheckApplyResultForUpgrade: true, }) options.TerraformVars = map[string]interface{}{ @@ -365,3 +366,25 @@ func writeTfvarsFile(t *testing.T, path string, vars map[string]interface{}) err } return err } + +// test edge case when only empty project is created +func TestCEProjectDABasic(t *testing.T) { + t.Parallel() + + options := testhelper.TestOptionsDefault(&testhelper.TestOptions{ + Testing: t, + TerraformDir: projectSolutionsDir, + Prefix: "ce-da-empty", + }) + + options.TerraformVars = map[string]interface{}{ + "existing_resource_group_name": resourceGroup, + "provider_visibility": "public", + "prefix": options.Prefix, + "project_name": "proj-test", + } + + output, err := options.RunTestConsistency() + assert.Nil(t, err, "This should not have errored") + assert.NotNil(t, output, "Expected some output") +} From 2692d57d10db42a1b45d75ff3b1e7493dde3e958 Mon Sep 17 00:00:00 2001 From: akocbek Date: Thu, 26 Jun 2025 22:32:12 +0100 Subject: [PATCH 3/3] SKIP UPGRADE TEST