Skip to content

Commit 1449ba6

Browse files
MaxrovrMaxrovr
authored
Releasing version 4.54.0
Releasing version 4.54.0
2 parents 47110bb + f084594 commit 1449ba6

13 files changed

+125
-36
lines changed

‎oci/bastion_bastion_internal_test.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@ var (
2525
"bastion_id": Representation{RepType: Required, Create: `${oci_bastion_bastion.test_bastion.id}`},
2626
}
2727

28+
internalBastionName = RandomString(15, charsetWithoutDigits)
29+
2830
InternalBastionDataSourceRepresentation = map[string]interface{}{
2931
"compartment_id": Representation{RepType: Required, Create: `${var.compartment_id}`},
3032
"bastion_id": Representation{RepType: Optional, Create: `${oci_bastion_bastion.test_bastion.id}`},
3133
"bastion_lifecycle_state": Representation{RepType: Optional, Create: `ACTIVE`},
32-
"name": Representation{RepType: Optional, Create: `bastionterraformtest`},
34+
"name": Representation{RepType: Optional, Create: internalBastionName},
3335
"filter": RepresentationGroup{Required, InternalBastionDataSourceFilterRepresentation}}
3436
InternalBastionDataSourceFilterRepresentation = map[string]interface{}{
3537
"name": Representation{RepType: Required, Create: `id`},
@@ -40,7 +42,7 @@ var (
4042
"bastion_type": Representation{RepType: Required, Create: `INTERNAL`},
4143
"compartment_id": Representation{RepType: Required, Create: `${var.compartment_id}`},
4244
"target_subnet_id": Representation{RepType: Required, Create: `${oci_core_subnet.test_subnet.id}`},
43-
"name": Representation{RepType: Required, Create: `bastionterraformtest`},
45+
"name": Representation{RepType: Required, Create: internalBastionName},
4446
"phone_book_entry": Representation{RepType: Required, Create: `OCIBastion`},
4547
"static_jump_host_ip_addresses": Representation{RepType: Optional, Create: []string{`10.0.0.3`}},
4648
}
@@ -100,7 +102,7 @@ func TestBastionBastionResource_internal(t *testing.T) {
100102
resource.TestCheckResourceAttr(resourceName, "bastion_type", "INTERNAL"),
101103
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
102104
resource.TestCheckResourceAttrSet(resourceName, "id"),
103-
resource.TestCheckResourceAttr(resourceName, "name", "bastionterraformtest"),
105+
resource.TestCheckResourceAttr(resourceName, "name", internalBastionName),
104106
resource.TestCheckResourceAttrSet(resourceName, "state"),
105107
resource.TestCheckResourceAttrSet(resourceName, "target_subnet_id"),
106108
resource.TestCheckResourceAttrSet(resourceName, "target_vcn_id"),
@@ -129,13 +131,13 @@ func TestBastionBastionResource_internal(t *testing.T) {
129131
resource.TestCheckResourceAttrSet(datasourceName, "bastion_id"),
130132
resource.TestCheckResourceAttr(datasourceName, "bastion_lifecycle_state", "ACTIVE"),
131133
resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
132-
resource.TestCheckResourceAttr(datasourceName, "name", "bastionterraformtest"),
134+
resource.TestCheckResourceAttr(datasourceName, "name", internalBastionName),
133135

134136
resource.TestCheckResourceAttr(datasourceName, "bastions.#", "1"),
135137
resource.TestCheckResourceAttr(datasourceName, "bastions.0.bastion_type", "INTERNAL"),
136138
resource.TestCheckResourceAttr(datasourceName, "bastions.0.compartment_id", compartmentId),
137139
resource.TestCheckResourceAttrSet(datasourceName, "bastions.0.id"),
138-
resource.TestCheckResourceAttr(datasourceName, "bastions.0.name", "bastionterraformtest"),
140+
resource.TestCheckResourceAttr(datasourceName, "bastions.0.name", internalBastionName),
139141
resource.TestCheckResourceAttrSet(datasourceName, "bastions.0.state"),
140142
resource.TestCheckResourceAttrSet(datasourceName, "bastions.0.target_subnet_id"),
141143
resource.TestCheckResourceAttrSet(datasourceName, "bastions.0.target_vcn_id"),
@@ -153,7 +155,7 @@ func TestBastionBastionResource_internal(t *testing.T) {
153155
resource.TestCheckResourceAttr(singularDatasourceName, "bastion_type", "INTERNAL"),
154156
resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
155157
resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
156-
resource.TestCheckResourceAttr(singularDatasourceName, "name", "bastionterraformtest"),
158+
resource.TestCheckResourceAttr(singularDatasourceName, "name", internalBastionName),
157159
resource.TestCheckResourceAttrSet(singularDatasourceName, "private_endpoint_ip_address"),
158160
resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
159161
resource.TestCheckResourceAttrSet(singularDatasourceName, "target_vcn_id"),

‎oci/bastion_bastion_test.go‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@ var (
3030
"bastion_id": Representation{RepType: Required, Create: `${oci_bastion_bastion.test_bastion.id}`},
3131
}
3232

33+
bastionName = RandomString(15, charsetWithoutDigits)
34+
3335
bastionDataSourceRepresentation = map[string]interface{}{
3436
"compartment_id": Representation{RepType: Required, Create: `${var.compartment_id}`},
3537
"bastion_id": Representation{RepType: Optional, Create: `${oci_bastion_bastion.test_bastion.id}`},
3638
"bastion_lifecycle_state": Representation{RepType: Optional, Create: `ACTIVE`},
37-
"name": Representation{RepType: Optional, Create: `bastionterraformtest`},
39+
"name": Representation{RepType: Optional, Create: bastionName},
3840
"filter": RepresentationGroup{Required, bastionDataSourceFilterRepresentation}}
3941
bastionDataSourceFilterRepresentation = map[string]interface{}{
4042
"name": Representation{RepType: Required, Create: `id`},
@@ -49,7 +51,7 @@ var (
4951
"defined_tags": Representation{RepType: Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
5052
"freeform_tags": Representation{RepType: Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
5153
"max_session_ttl_in_seconds": Representation{RepType: Optional, Create: `1800`, Update: `3600`},
52-
"name": Representation{RepType: Required, Create: `bastionterraformtest`, Update: "BastionTerraformtest"},
54+
"name": Representation{RepType: Required, Create: bastionName},
5355
}
5456

5557
BastionResourceDependencies = GenerateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", Required, Create, subnetRepresentation) +
@@ -112,7 +114,7 @@ func TestBastionBastionResource_basic(t *testing.T) {
112114
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
113115
resource.TestCheckResourceAttrSet(resourceName, "id"),
114116
resource.TestCheckResourceAttr(resourceName, "max_session_ttl_in_seconds", "1800"),
115-
resource.TestCheckResourceAttr(resourceName, "name", "bastionterraformtest"),
117+
resource.TestCheckResourceAttr(resourceName, "name", bastionName),
116118
resource.TestCheckResourceAttrSet(resourceName, "state"),
117119
resource.TestCheckResourceAttrSet(resourceName, "target_subnet_id"),
118120
resource.TestCheckResourceAttrSet(resourceName, "target_vcn_id"),
@@ -145,7 +147,7 @@ func TestBastionBastionResource_basic(t *testing.T) {
145147
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
146148
resource.TestCheckResourceAttrSet(resourceName, "id"),
147149
resource.TestCheckResourceAttr(resourceName, "max_session_ttl_in_seconds", "1800"),
148-
resource.TestCheckResourceAttr(resourceName, "name", "bastionterraformtest"),
150+
resource.TestCheckResourceAttr(resourceName, "name", bastionName),
149151
resource.TestCheckResourceAttrSet(resourceName, "state"),
150152
resource.TestCheckResourceAttrSet(resourceName, "target_subnet_id"),
151153
resource.TestCheckResourceAttrSet(resourceName, "target_vcn_id"),
@@ -173,7 +175,7 @@ func TestBastionBastionResource_basic(t *testing.T) {
173175
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
174176
resource.TestCheckResourceAttrSet(resourceName, "id"),
175177
resource.TestCheckResourceAttr(resourceName, "max_session_ttl_in_seconds", "3600"),
176-
resource.TestCheckResourceAttr(resourceName, "name", "bastionterraformtest"),
178+
resource.TestCheckResourceAttr(resourceName, "name", bastionName),
177179
resource.TestCheckResourceAttrSet(resourceName, "state"),
178180
resource.TestCheckResourceAttrSet(resourceName, "target_subnet_id"),
179181
resource.TestCheckResourceAttrSet(resourceName, "target_vcn_id"),
@@ -198,15 +200,15 @@ func TestBastionBastionResource_basic(t *testing.T) {
198200
resource.TestCheckResourceAttrSet(datasourceName, "bastion_id"),
199201
resource.TestCheckResourceAttr(datasourceName, "bastion_lifecycle_state", "ACTIVE"),
200202
resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
201-
resource.TestCheckResourceAttr(datasourceName, "name", "bastionterraformtest"),
203+
resource.TestCheckResourceAttr(datasourceName, "name", bastionName),
202204

203205
resource.TestCheckResourceAttr(datasourceName, "bastions.#", "1"),
204206
resource.TestCheckResourceAttr(datasourceName, "bastions.0.bastion_type", "STANDARD"),
205207
resource.TestCheckResourceAttr(datasourceName, "bastions.0.compartment_id", compartmentId),
206208
resource.TestCheckResourceAttr(datasourceName, "bastions.0.defined_tags.%", "1"),
207209
resource.TestCheckResourceAttr(datasourceName, "bastions.0.freeform_tags.%", "1"),
208210
resource.TestCheckResourceAttrSet(datasourceName, "bastions.0.id"),
209-
resource.TestCheckResourceAttr(datasourceName, "bastions.0.name", "bastionterraformtest"),
211+
resource.TestCheckResourceAttr(datasourceName, "bastions.0.name", bastionName),
210212
resource.TestCheckResourceAttrSet(datasourceName, "bastions.0.state"),
211213
resource.TestCheckResourceAttrSet(datasourceName, "bastions.0.target_subnet_id"),
212214
resource.TestCheckResourceAttrSet(datasourceName, "bastions.0.target_vcn_id"),
@@ -230,7 +232,7 @@ func TestBastionBastionResource_basic(t *testing.T) {
230232
resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
231233
resource.TestCheckResourceAttr(singularDatasourceName, "max_session_ttl_in_seconds", "3600"),
232234
resource.TestCheckResourceAttrSet(singularDatasourceName, "max_sessions_allowed"),
233-
resource.TestCheckResourceAttr(singularDatasourceName, "name", "bastionterraformtest"),
235+
resource.TestCheckResourceAttr(singularDatasourceName, "name", bastionName),
234236
resource.TestCheckResourceAttrSet(singularDatasourceName, "private_endpoint_ip_address"),
235237
resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
236238
resource.TestCheckResourceAttrSet(singularDatasourceName, "target_vcn_id"),

‎oci/devops_deploy_artifact_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ var (
6161

6262
DeployArtifactResourceDependencies = GenerateResourceFromRepresentationMap("oci_devops_project", "test_project", Required, Create, devopsProjectRepresentation) +
6363
DefinedTagsDependencies +
64-
GenerateResourceFromRepresentationMap("oci_logging_log_group", "test_log_group", Required, Create, logGroupRepresentation) +
64+
GenerateResourceFromRepresentationMap("oci_logging_log_group", "test_devops_log_group", Required, Create, devopsLogGroupRepresentation) +
6565
GenerateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, notificationTopicRepresentation)
6666
)
6767

‎oci/devops_deploy_environment_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ var (
5555

5656
DeployEnvironmentResourceDependencies = AvailabilityDomainConfig +
5757
GenerateResourceFromRepresentationMap("oci_devops_project", "test_project", Required, Create, devopsProjectRepresentation) +
58-
GenerateResourceFromRepresentationMap("oci_logging_log_group", "test_log_group", Required, Create, logGroupRepresentation) +
58+
GenerateResourceFromRepresentationMap("oci_logging_log_group", "test_devops_log_group", Required, Create, devopsLogGroupRepresentation) +
5959
GenerateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, notificationTopicRepresentation) +
6060
DefinedTagsDependencies
6161
)

‎oci/devops_deploy_stage_invoke_function_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ var (
3030
"function_deploy_environment_id": Representation{RepType: Required, Create: `${oci_devops_deploy_environment.test_deploy_function_environment_1.id}`},
3131
"is_async": Representation{RepType: Required, Create: `true`, Update: `false`},
3232
"is_validation_enabled": Representation{RepType: Required, Create: `false`, Update: `true`},
33-
"deploy_artifact_id": Representation{RepType: Optional, Create: `${oci_devops_deploy_artifact.test_deploy_ocir_artifact_1.id}`},
33+
"deploy_artifact_id": Representation{RepType: Optional, Create: `${oci_devops_deploy_artifact.test_deploy_generic_artifact_1.id}`},
3434
}))
3535

36-
DeployInvokeFunctionStageResourceDependencies = GenerateResourceFromRepresentationMap("oci_devops_deploy_artifact", "test_deploy_ocir_artifact_1", Required, Create, deployOcirArtifactRepresentation) +
36+
DeployInvokeFunctionStageResourceDependencies = GenerateResourceFromRepresentationMap("oci_devops_deploy_artifact", "test_deploy_generic_artifact_1", Required, Create, deployGenericArtifactRepresentation) +
3737
GenerateResourceFromRepresentationMap("oci_devops_deploy_environment", "test_deploy_function_environment_1", Required, Create, deployFunctionEnvironmentRepresentation) +
3838
GenerateResourceFromRepresentationMap("oci_devops_deploy_pipeline", "test_deploy_pipeline", Required, Create, deployPipelineRepresentation) +
3939
GenerateResourceFromRepresentationMap("oci_devops_project", "test_project", Required, Create, devopsProjectRepresentation) +

‎oci/devops_deployment_pipeline_redployment_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ var (
4949
GenerateResourceFromRepresentationMap("oci_devops_deployment", "test_deploy_1", Required, Create, devopsDeploymentRepresentation) +
5050
AvailabilityDomainConfig +
5151
DefinedTagsDependencies +
52-
GenerateResourceFromRepresentationMap("oci_logging_log_group", "test_log_group", Required, Create, logGroupRepresentation) +
52+
GenerateResourceFromRepresentationMap("oci_logging_log_group", "test_devops_log_group", Required, Create, devopsLogGroupRepresentation) +
5353
GenerateResourceFromRepresentationMap("oci_logging_log", "test_log", Optional, Create, deployLogRepresentation) +
5454
GenerateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, notificationTopicRepresentation)
5555
)

‎oci/devops_deployment_single_stage_test.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ var (
7373
"display_name": Representation{RepType: Optional, Create: `displayName`},
7474
"id": Representation{RepType: Optional, Create: `${oci_devops_deployment.test_deployment.id}`},
7575
"project_id": Representation{RepType: Optional, Create: `${oci_devops_project.test_project.id}`},
76-
"state": Representation{RepType: Optional, Create: `Active`},
76+
"state": Representation{RepType: Optional, Create: `Accepted`},
7777
"filter": RepresentationGroup{Required, devopsSingleStageDeploymentDataSourceFilterRepresentation}}
7878
devopsSingleStageDeploymentDataSourceFilterRepresentation = map[string]interface{}{
7979
"name": Representation{RepType: Required, Create: `id`},
@@ -87,12 +87,12 @@ var (
8787
"display_name": Representation{RepType: Optional, Create: `displayName`},
8888
"freeform_tags": Representation{RepType: Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
8989
"deploy_stage_id": Representation{RepType: Required, Create: `${oci_devops_deploy_stage.test_deploy_stage.id}`},
90-
"lifecycle": RepresentationGroup{Required, ignoreDefinedTagsDifferencesRepresentation},
90+
"lifecycle": RepresentationGroup{Required, ignoreExecutionProgressDifferencesRepresentation},
9191
}
9292

9393
deployLogRepresentation = map[string]interface{}{
9494
"display_name": Representation{RepType: Required, Create: `displayName`, Update: `displayName2`},
95-
"log_group_id": Representation{RepType: Required, Create: `${oci_logging_log_group.test_log_group.id}`, Update: `${oci_logging_log_group.test_update_log_group.id}`},
95+
"log_group_id": Representation{RepType: Required, Create: `${oci_logging_log_group.test_devops_log_group.id}`},
9696
"log_type": Representation{RepType: Required, Create: `SERVICE`},
9797
"configuration": RepresentationGroup{Required, devopLogConfigurationRepresentation},
9898
"defined_tags": Representation{RepType: Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
@@ -102,14 +102,18 @@ var (
102102
"lifecycle": RepresentationGroup{Required, ignoreDefinedTagsDifferencesRepresentation},
103103
}
104104

105+
ignoreExecutionProgressDifferencesRepresentation = map[string]interface{}{
106+
"ignore_changes": Representation{RepType: Required, Create: []string{`deployment_execution_progress`, `defined_tags`}},
107+
}
108+
105109
DevopsSingleStageDeploymentResourceDependencies = GenerateResourceFromRepresentationMap("oci_devops_deploy_artifact", "test_deploy_inline_artifact", Required, Create, deployGenericArtifactSingleStageRepresentation) +
106110
GenerateResourceFromRepresentationMap("oci_devops_deploy_environment", "test_deploy_kubernetes_environment", Required, Create, deployOkeEnvironmentRepresentation) +
107111
GenerateResourceFromRepresentationMap("oci_devops_deploy_pipeline", "test_deploy_pipeline", Required, Create, deployPipelineRepresentation) +
108112
GenerateResourceFromRepresentationMap("oci_devops_deploy_stage", "test_deploy_stage", Required, Create, deployOkeSingleStageRepresentation) +
109113
GenerateResourceFromRepresentationMap("oci_devops_project", "test_project", Required, Create, devopsProjectRepresentation) +
110114
AvailabilityDomainConfig +
111115
DefinedTagsDependencies +
112-
GenerateResourceFromRepresentationMap("oci_logging_log_group", "test_log_group", Required, Create, logGroupRepresentation) +
116+
GenerateResourceFromRepresentationMap("oci_logging_log_group", "test_devops_log_group", Required, Create, devopsLogGroupRepresentation) +
113117
GenerateResourceFromRepresentationMap("oci_logging_log", "test_log", Optional, Create, deployLogRepresentation) +
114118
GenerateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, notificationTopicRepresentation)
115119
)

‎oci/devops_deployment_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ var (
7070
GenerateResourceFromRepresentationMap("oci_devops_project", "test_project", Required, Create, devopsProjectRepresentation) +
7171
AvailabilityDomainConfig +
7272
DefinedTagsDependencies +
73-
GenerateResourceFromRepresentationMap("oci_logging_log_group", "test_log_group", Required, Create, logGroupRepresentation) +
73+
GenerateResourceFromRepresentationMap("oci_logging_log_group", "test_devops_log_group", Required, Create, devopsLogGroupRepresentation) +
7474
GenerateResourceFromRepresentationMap("oci_logging_log", "test_log", Optional, Create, deployLogRepresentation) +
7575
GenerateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", Required, Create, notificationTopicRepresentation)
7676
)

0 commit comments

Comments
 (0)