Skip to content

Commit a626dcd

Browse files
ilya-hontarauilya-hontarau
authored
Merge pull request #555 from spacelift-io/fix/update-module-id
Update module id
2 parents d675c1c + d678f00 commit a626dcd

19 files changed

+30
-30
lines changed

‎spacelift/data_aws_integration_attachment_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func TestAWSIntegrationAttachmentData(t *testing.T) {
8686
Check: Resource(
8787
resourceName,
8888
Attribute("id", IsNotEmpty()),
89-
Attribute("module_id", Equals(fmt.Sprintf("test-module-%s", randomID))),
89+
Attribute("module_id", Equals(fmt.Sprintf("terraform-default-test-module-%s", randomID))),
9090
AttributeNotPresent("stack_id"),
9191
),
9292
}})

‎spacelift/data_aws_role_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func TestAWSRoleData(t *testing.T) {
6969
Check: Resource(
7070
"data.spacelift_aws_role.test",
7171
Attribute("id", IsNotEmpty()),
72-
Attribute("module_id", Equals(fmt.Sprintf("test-module-%s", randomID))),
72+
Attribute("module_id", Equals(fmt.Sprintf("terraform-default-test-module-%s", randomID))),
7373
Attribute("role_arn", Equals("arn:aws:iam::039653571618:role/empty-test-role")),
7474
Attribute("generate_credentials_in_worker", Equals("false")),
7575
Attribute("duration_seconds", Equals("931")),
@@ -138,7 +138,7 @@ func TestAWSRoleData(t *testing.T) {
138138
Check: Resource(
139139
"data.spacelift_aws_role.test",
140140
Attribute("id", IsNotEmpty()),
141-
Attribute("module_id", Equals(fmt.Sprintf("test-module-%s", randomID))),
141+
Attribute("module_id", Equals(fmt.Sprintf("terraform-default-test-module-%s", randomID))),
142142
Attribute("role_arn", Equals("custom_role_arn")),
143143
Attribute("generate_credentials_in_worker", Equals("true")),
144144
Attribute("external_id", Equals("external@id")),

‎spacelift/data_azure_integration_attachment_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func TestAzureIntegrationAttachmentData(t *testing.T) {
8585
Check: Resource(
8686
resourceName,
8787
Attribute("id", IsNotEmpty()),
88-
Attribute("module_id", Equals(fmt.Sprintf("test-module-%s", randomID))),
88+
Attribute("module_id", Equals(fmt.Sprintf("terraform-default-test-module-%s", randomID))),
8989
AttributeNotPresent("stack_id"),
9090
),
9191
}})

‎spacelift/data_context_attachment_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func TestContextAttachmentData(t *testing.T) {
7777
Check: Resource(
7878
"data.spacelift_context_attachment.test",
7979
Attribute("id", IsNotEmpty()),
80-
Attribute("module_id", Equals(fmt.Sprintf("test-module-%s", randomID))),
80+
Attribute("module_id", Equals(fmt.Sprintf("terraform-default-test-module-%s", randomID))),
8181
Attribute("priority", Equals("1")),
8282
AttributeNotPresent("stack_id"),
8383
),

‎spacelift/data_environment_variable_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func TestEnvironmentVariableData(t *testing.T) {
7070
`, randomID),
7171
Check: Resource(
7272
"data.spacelift_environment_variable.test",
73-
Attribute("module_id", Equals(fmt.Sprintf("test-module-%s", randomID))),
73+
Attribute("module_id", Equals(fmt.Sprintf("terraform-default-test-module-%s", randomID))),
7474
Attribute("value", Equals("is tasty")),
7575
Attribute("write_only", Equals("false")),
7676
AttributeNotPresent("context_id"),

‎spacelift/data_gcp_service_account_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func TestGCPServiceAccountData(t *testing.T) {
6464
Check: Resource(
6565
"data.spacelift_gcp_service_account.test",
6666
Attribute("id", IsNotEmpty()),
67-
Attribute("module_id", Equals(fmt.Sprintf("test-module-%s", randomID))),
67+
Attribute("module_id", Equals(fmt.Sprintf("terraform-default-test-module-%s", randomID))),
6868
Attribute("service_account_email", IsNotEmpty()),
6969
SetEquals("token_scopes", "https://www.googleapis.com/auth/compute"),
7070
AttributeNotPresent("stack_id"),

‎spacelift/data_module_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestModuleData(t *testing.T) {
3131
`, randomID),
3232
Check: Resource(
3333
"data.spacelift_module.test",
34-
Attribute("id", Equals(fmt.Sprintf("test-module-%s", randomID))),
34+
Attribute("id", Equals(fmt.Sprintf("terraform-default-test-module-%s", randomID))),
3535
Attribute("administrative", Equals("true")),
3636
Attribute("branch", Equals("master")),
3737
Attribute("description", Equals("description")),
@@ -117,7 +117,7 @@ func TestModuleDataSpace(t *testing.T) {
117117
`, randomID),
118118
Check: Resource(
119119
"data.spacelift_module.test",
120-
Attribute("id", Equals(fmt.Sprintf("test-module-%s", randomID))),
120+
Attribute("id", Equals(fmt.Sprintf("terraform-default-test-module-%s", randomID))),
121121
Attribute("administrative", Equals("true")),
122122
Attribute("branch", Equals("master")),
123123
Attribute("description", Equals("description")),

‎spacelift/data_mounted_file_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func TestMountedFileData(t *testing.T) {
6969
`, randomID),
7070
Check: Resource(
7171
"data.spacelift_mounted_file.test",
72-
Attribute("module_id", Equals(fmt.Sprintf("test-module-%s", randomID))),
72+
Attribute("module_id", Equals(fmt.Sprintf("terraform-default-test-module-%s", randomID))),
7373
Attribute("content", Equals("YmFjb24gaXMgdGFzdHk=")),
7474
Attribute("write_only", Equals("false")),
7575
AttributeNotPresent("context_id"),

‎spacelift/data_stack_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ func TestStackData(t *testing.T) {
187187
`, randomID),
188188
Check: Resource(
189189
"data.spacelift_stack.test",
190-
Attribute("kubernetes.0.kubectl_version", Equals("1.23.5")),
190+
Attribute("kubernetes.0.kubectl_version", IsNotEmpty()),
191191
),
192192
}})
193193
})

‎spacelift/data_webhook_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func TestWebhookData(t *testing.T) {
7373
Attribute("endpoint", Equals("https://bacon.org")),
7474
Attribute("enabled", Equals("true")),
7575
Attribute("secret", Equals("very-very-secret")),
76-
Attribute("module_id", Equals(fmt.Sprintf("test-module-%s", randomID))),
76+
Attribute("module_id", Equals(fmt.Sprintf("terraform-default-test-module-%s", randomID))),
7777
AttributeNotPresent("stack_id"),
7878
),
7979
}})

‎spacelift/resource_aws_role_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func TestAWSRoleResource(t *testing.T) {
8484
Check: Resource(
8585
resourceName,
8686
Attribute("id", IsNotEmpty()),
87-
Attribute("module_id", Equals(fmt.Sprintf("test-module-%s", randomID))),
87+
Attribute("module_id", Equals(fmt.Sprintf("terraform-default-test-module-%s", randomID))),
8888
Attribute("generate_credentials_in_worker", Equals("false")),
8989
Attribute("duration_seconds", Equals("942")),
9090
Attribute("external_id", IsEmpty()),
@@ -94,7 +94,7 @@ func TestAWSRoleResource(t *testing.T) {
9494
{
9595
ResourceName: resourceName,
9696
ImportState: true,
97-
ImportStateId: fmt.Sprintf("module/test-module-%s", randomID),
97+
ImportStateId: fmt.Sprintf("module/terraform-default-test-module-%s", randomID),
9898
ImportStateVerify: true,
9999
},
100100
})
@@ -150,7 +150,7 @@ func TestAWSRoleResource(t *testing.T) {
150150
Check: Resource(
151151
"spacelift_aws_role.test",
152152
Attribute("id", IsNotEmpty()),
153-
Attribute("module_id", Equals(fmt.Sprintf("test-module-%s", randomID))),
153+
Attribute("module_id", Equals(fmt.Sprintf("terraform-default-test-module-%s", randomID))),
154154
Attribute("generate_credentials_in_worker", Equals("true")),
155155
Attribute("external_id", IsEmpty()),
156156
AttributeNotPresent("stack_id"),

‎spacelift/resource_context_attachment_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@ func TestContextAttachmentResource(t *testing.T) {
9191
Check: Resource(
9292
"spacelift_context_attachment.test",
9393
Attribute("id", IsNotEmpty()),
94-
Attribute("module_id", Equals(fmt.Sprintf("test-module-%s", randomID))),
94+
Attribute("module_id", Equals(fmt.Sprintf("terraform-default-test-module-%s", randomID))),
9595
AttributeNotPresent("stack_id"),
9696
),
9797
},
9898
{
9999
ResourceName: resourceName,
100100
ImportState: true,
101-
ImportStateId: fmt.Sprintf("test-context-%s/test-module-%s", randomID, randomID),
101+
ImportStateId: fmt.Sprintf("test-context-%s/terraform-default-test-module-%s", randomID, randomID),
102102
ImportStateVerify: true,
103103
}})
104104
})

‎spacelift/resource_environment_variable_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func TestEnvironmentVariableResource(t *testing.T) {
8484
`, randomID),
8585
Check: Resource(
8686
resourceName,
87-
Attribute("module_id", Equals(fmt.Sprintf("test-module-%s", randomID))),
87+
Attribute("module_id", Equals(fmt.Sprintf("terraform-default-test-module-%s", randomID))),
8888
Attribute("value", Equals("4d5d01ea427b10dd483e8fce5b5149fb5a9814e9ee614176b756ca4a65c8f154")),
8989
Attribute("write_only", Equals("true")),
9090
AttributeNotPresent("context_id"),

‎spacelift/resource_gcp_service_account_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ func TestGCPServiceAccountResource(t *testing.T) {
7777
Check: Resource(
7878
resourceName,
7979
Attribute("id", IsNotEmpty()),
80-
Attribute("module_id", Equals(fmt.Sprintf("test-module-%s", randomID))),
80+
Attribute("module_id", Equals(fmt.Sprintf("terraform-default-test-module-%s", randomID))),
8181
),
8282
},
8383
{
8484
ResourceName: resourceName,
8585
ImportState: true,
86-
ImportStateId: fmt.Sprintf("module/test-module-%s", randomID),
86+
ImportStateId: fmt.Sprintf("module/terraform-default-test-module-%s", randomID),
8787
ImportStateVerify: true,
8888
},
8989
})

‎spacelift/resource_module_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestModuleResource(t *testing.T) {
3838
Config: config("old description", true, false),
3939
Check: Resource(
4040
"spacelift_module.test",
41-
Attribute("id", Equals(fmt.Sprintf("github-module-%s", randomID))),
41+
Attribute("id", Equals(fmt.Sprintf("terraform-default-github-module-%s", randomID))),
4242
Attribute("administrative", Equals("true")),
4343
Attribute("branch", Equals("master")),
4444
Attribute("description", Equals("old description")),
@@ -95,7 +95,7 @@ func TestModuleResource(t *testing.T) {
9595
Config: config("test-root/ab"),
9696
Check: Resource(
9797
"spacelift_module.test",
98-
Attribute("id", Equals(fmt.Sprintf("project-root-%s", randomID))),
98+
Attribute("id", Equals(fmt.Sprintf("terraform-papaya-project-root-%s", randomID))),
9999
Attribute("administrative", Equals("true")),
100100
Attribute("branch", Equals("master")),
101101
Attribute("description", Equals("description")),
@@ -286,7 +286,7 @@ func TestModuleResourceSpace(t *testing.T) {
286286
Config: config("old description", true),
287287
Check: Resource(
288288
"spacelift_module.test",
289-
Attribute("id", Equals(fmt.Sprintf("github-module-%s", randomID))),
289+
Attribute("id", Equals(fmt.Sprintf("terraform-default-github-module-%s", randomID))),
290290
Attribute("administrative", Equals("true")),
291291
Attribute("branch", Equals("master")),
292292
Attribute("description", Equals("old description")),
@@ -342,7 +342,7 @@ func TestModuleResourceSpace(t *testing.T) {
342342
Config: config("test-root/ab"),
343343
Check: Resource(
344344
"spacelift_module.test",
345-
Attribute("id", Equals(fmt.Sprintf("project-root-%s", randomID))),
345+
Attribute("id", Equals(fmt.Sprintf("terraform-papaya-project-root-%s", randomID))),
346346
Attribute("administrative", Equals("true")),
347347
Attribute("branch", Equals("master")),
348348
Attribute("description", Equals("description")),

‎spacelift/resource_mounted_file_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func TestMountedFileResource(t *testing.T) {
7575
`, randomID),
7676
Check: Resource(
7777
resourceName,
78-
Attribute("module_id", Equals(fmt.Sprintf("test-module-%s", randomID))),
78+
Attribute("module_id", Equals(fmt.Sprintf("terraform-default-test-module-%s", randomID))),
7979
Attribute("write_only", Equals("true")),
8080
),
8181
},

‎spacelift/resource_policy_attachment_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@ func TestPolicyAttachmentResource(t *testing.T) {
8181
resourceName,
8282
Attribute("id", IsNotEmpty()),
8383
Attribute("policy_id", Contains(randomID)),
84-
Attribute("module_id", Equals(fmt.Sprintf("test-module-%s", randomID))),
84+
Attribute("module_id", Equals(fmt.Sprintf("terraform-default-test-module-%s", randomID))),
8585
),
8686
},
8787
{
8888
ResourceName: resourceName,
8989
ImportState: true,
90-
ImportStateId: fmt.Sprintf("my-first-policy-%s/test-module-%s", randomID, randomID),
90+
ImportStateId: fmt.Sprintf("my-first-policy-%s/terraform-default-test-module-%s", randomID, randomID),
9191
ImportStateVerify: true,
9292
},
9393
})

‎spacelift/resource_stack_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ func TestStackResource(t *testing.T) {
488488
resourceName,
489489
Attribute("id", StartsWith("provider-test-stack")),
490490
Attribute("kubernetes.0.namespace", Equals("")),
491-
Attribute("kubernetes.0.kubectl_version", Equals("1.23.5")),
491+
Attribute("kubernetes.0.kubectl_version", IsNotEmpty()),
492492
Attribute("ansible.#", Equals("0")),
493493
Attribute("pulumi.#", Equals("0")),
494494
Attribute("cloudformation.#", Equals("0")),
@@ -503,7 +503,7 @@ func TestStackResource(t *testing.T) {
503503
resourceName,
504504
Attribute("id", StartsWith("provider-test-stack")),
505505
Attribute("kubernetes.0.namespace", Equals("myapp-prod")),
506-
Attribute("kubernetes.0.kubectl_version", Equals("1.23.5")),
506+
Attribute("kubernetes.0.kubectl_version", IsNotEmpty()),
507507
Attribute("ansible.#", Equals("0")),
508508
Attribute("pulumi.#", Equals("0")),
509509
Attribute("cloudformation.#", Equals("0")),

‎spacelift/resource_webhook_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func TestWebhookResource(t *testing.T) {
8383
{
8484
ResourceName: resourceName,
8585
ImportState: true,
86-
ImportStateIdPrefix: fmt.Sprintf("module/test-module-%s/", randomID),
86+
ImportStateIdPrefix: fmt.Sprintf("module/terraform-default-test-module-%s/", randomID),
8787
ImportStateVerify: true,
8888
},
8989
})

0 commit comments

Comments
 (0)