Skip to content

Commit b3e3936

Browse files
vlalan-codesagarp337
vlalan-code
authored and
sagarp337
committed
Bug Fix - Adding missing visualbuilder service code
1 parent 9b696c3 commit b3e3936

File tree

3 files changed

+63
-36
lines changed

3 files changed

+63
-36
lines changed

‎internal/integrationtest/visual_builder_vb_instance_test.go‎

Lines changed: 60 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,15 @@ var (
6666
"is_visual_builder_enabled": acctest.Representation{RepType: acctest.Required, Create: `true`},
6767
}
6868
vbInstanceAlternateCustomEndpointsRepresentation = map[string]interface{}{
69-
"hostname": acctest.Representation{RepType: acctest.Required, Create: `hostname`, Update: `hostname2`},
69+
"hostname": acctest.Representation{RepType: acctest.Required, Create: `hostname.com`, Update: `hostname2.com`},
7070
"certificate_secret_id": acctest.Representation{RepType: acctest.Optional, Create: `${oci_vault_secret.test_secret.id}`},
7171
}
7272
vbInstanceCustomEndpointRepresentation = map[string]interface{}{
7373
"hostname": acctest.Representation{RepType: acctest.Required, Create: `hostname.com`, Update: `hostname2.com`},
7474
"certificate_secret_id": acctest.Representation{RepType: acctest.Optional, Create: `${var.oci_vault_secret_id}`},
7575
}
7676

77-
VbInstanceResourceDependencies = DefinedTagsDependencies +
78-
acctest.GenerateResourceFromRepresentationMap("oci_kms_vault", "test_vault", acctest.Required, acctest.Create, vaultRepresentation) +
79-
acctest.GenerateDataSourceFromRepresentationMap("oci_vault_secrets", "test_secrets", acctest.Required, acctest.Create, secretDataSourceRepresentation)
77+
VbInstanceResourceDependencies = DefinedTagsDependencies
8078
)
8179

8280
// issue-routing-tag: visual_builder/default
@@ -92,6 +90,9 @@ func TestVisualBuilderVbInstanceResource_basic(t *testing.T) {
9290
compartmentIdU := utils.GetEnvSettingWithDefault("compartment_id_for_update", compartmentId)
9391
compartmentIdUVariableStr := fmt.Sprintf("variable \"compartment_id_for_update\" { default = \"%s\" }\n", compartmentIdU)
9492

93+
vaultSecretId := utils.GetEnvSettingWithBlankDefault("oci_vault_secret_id")
94+
vaultSecretIdStr := fmt.Sprintf("variable \"oci_vault_secret_id\" { default = \"%s\" }\n", vaultSecretId)
95+
9596
resourceName := "oci_visual_builder_vb_instance.test_vb_instance"
9697
datasourceName := "data.oci_visual_builder_vb_instances.test_vb_instances"
9798
singularDatasourceName := "data.oci_visual_builder_vb_instance.test_vb_instance"
@@ -104,12 +105,12 @@ func TestVisualBuilderVbInstanceResource_basic(t *testing.T) {
104105
acctest.ResourceTest(t, testAccCheckVisualBuilderVbInstanceDestroy, []resource.TestStep{
105106
// verify Create
106107
{
107-
Config: config + compartmentIdVariableStr + VbInstanceResourceDependencies +
108+
Config: config + compartmentIdVariableStr + idcsOpenIdVariableStr() + VbInstanceResourceDependencies +
108109
acctest.GenerateResourceFromRepresentationMap("oci_visual_builder_vb_instance", "test_vb_instance", acctest.Required, acctest.Create, vbInstanceRepresentation),
109110
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
110111
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
111112
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
112-
resource.TestCheckResourceAttr(resourceName, "node_count", "10"),
113+
resource.TestCheckResourceAttr(resourceName, "node_count", "1"),
113114

114115
func(s *terraform.State) (err error) {
115116
resId, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -120,28 +121,31 @@ func TestVisualBuilderVbInstanceResource_basic(t *testing.T) {
120121

121122
// delete before next Create
122123
{
123-
Config: config + compartmentIdVariableStr + VbInstanceResourceDependencies,
124+
Config: config + compartmentIdVariableStr + idcsOpenIdVariableStr(),
124125
},
125126
// verify Create with optionals
126127
{
127-
Config: config + compartmentIdVariableStr + VbInstanceResourceDependencies +
128+
Config: config + compartmentIdVariableStr +
129+
idcsOpenIdVariableStr() +
130+
vaultSecretIdStr +
131+
VbInstanceResourceDependencies +
128132
acctest.GenerateResourceFromRepresentationMap("oci_visual_builder_vb_instance", "test_vb_instance", acctest.Optional, acctest.Create, vbInstanceRepresentation),
129133
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
130-
resource.TestCheckResourceAttr(resourceName, "alternate_custom_endpoints.#", "1"),
131-
resource.TestCheckResourceAttrSet(resourceName, "alternate_custom_endpoints.0.certificate_secret_id"),
132-
resource.TestCheckResourceAttr(resourceName, "alternate_custom_endpoints.0.hostname", "hostname"),
134+
//resource.TestCheckResourceAttr(resourceName, "alternate_custom_endpoints.#", "1"),
135+
//resource.TestCheckResourceAttrSet(resourceName, "alternate_custom_endpoints.0.certificate_secret_id"),
136+
//resource.TestCheckResourceAttr(resourceName, "alternate_custom_endpoints.0.hostname", "hostname"),
133137
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
134138
resource.TestCheckResourceAttr(resourceName, "consumption_model", "UCM"),
135139
resource.TestCheckResourceAttr(resourceName, "custom_endpoint.#", "1"),
136140
resource.TestCheckResourceAttrSet(resourceName, "custom_endpoint.0.certificate_secret_id"),
137-
resource.TestCheckResourceAttr(resourceName, "custom_endpoint.0.hostname", "hostname"),
141+
resource.TestCheckResourceAttr(resourceName, "custom_endpoint.0.hostname", "hostname.com"),
138142
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
139143
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
140144
resource.TestCheckResourceAttrSet(resourceName, "id"),
141145
resource.TestCheckResourceAttrSet(resourceName, "idcs_open_id"),
142146
resource.TestCheckResourceAttrSet(resourceName, "instance_url"),
143-
resource.TestCheckResourceAttr(resourceName, "is_visual_builder_enabled", "false"),
144-
resource.TestCheckResourceAttr(resourceName, "node_count", "10"),
147+
resource.TestCheckResourceAttr(resourceName, "is_visual_builder_enabled", "true"),
148+
resource.TestCheckResourceAttr(resourceName, "node_count", "1"),
145149
resource.TestCheckResourceAttrSet(resourceName, "state"),
146150

147151
func(s *terraform.State) (err error) {
@@ -158,27 +162,27 @@ func TestVisualBuilderVbInstanceResource_basic(t *testing.T) {
158162

159163
// verify Update to the compartment (the compartment will be switched back in the next step)
160164
{
161-
Config: config + compartmentIdVariableStr + compartmentIdUVariableStr + VbInstanceResourceDependencies +
165+
Config: config + compartmentIdVariableStr + compartmentIdUVariableStr + idcsOpenIdVariableStr() + vaultSecretIdStr + VbInstanceResourceDependencies +
162166
acctest.GenerateResourceFromRepresentationMap("oci_visual_builder_vb_instance", "test_vb_instance", acctest.Optional, acctest.Create,
163167
acctest.RepresentationCopyWithNewProperties(vbInstanceRepresentation, map[string]interface{}{
164168
"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id_for_update}`},
165169
})),
166170
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
167-
resource.TestCheckResourceAttr(resourceName, "alternate_custom_endpoints.#", "1"),
168-
resource.TestCheckResourceAttrSet(resourceName, "alternate_custom_endpoints.0.certificate_secret_id"),
169-
resource.TestCheckResourceAttr(resourceName, "alternate_custom_endpoints.0.hostname", "hostname"),
171+
//resource.TestCheckResourceAttr(resourceName, "alternate_custom_endpoints.#", "1"),
172+
//resource.TestCheckResourceAttrSet(resourceName, "alternate_custom_endpoints.0.certificate_secret_id"),
173+
//resource.TestCheckResourceAttr(resourceName, "alternate_custom_endpoints.0.hostname", "hostname"),
170174
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentIdU),
171175
resource.TestCheckResourceAttr(resourceName, "consumption_model", "UCM"),
172176
resource.TestCheckResourceAttr(resourceName, "custom_endpoint.#", "1"),
173177
resource.TestCheckResourceAttrSet(resourceName, "custom_endpoint.0.certificate_secret_id"),
174-
resource.TestCheckResourceAttr(resourceName, "custom_endpoint.0.hostname", "hostname"),
178+
resource.TestCheckResourceAttr(resourceName, "custom_endpoint.0.hostname", "hostname.com"),
175179
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
176180
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
177181
resource.TestCheckResourceAttrSet(resourceName, "id"),
178182
resource.TestCheckResourceAttrSet(resourceName, "idcs_open_id"),
179183
resource.TestCheckResourceAttrSet(resourceName, "instance_url"),
180-
resource.TestCheckResourceAttr(resourceName, "is_visual_builder_enabled", "false"),
181-
resource.TestCheckResourceAttr(resourceName, "node_count", "10"),
184+
resource.TestCheckResourceAttr(resourceName, "is_visual_builder_enabled", "true"),
185+
resource.TestCheckResourceAttr(resourceName, "node_count", "1"),
182186
resource.TestCheckResourceAttrSet(resourceName, "state"),
183187

184188
func(s *terraform.State) (err error) {
@@ -193,24 +197,24 @@ func TestVisualBuilderVbInstanceResource_basic(t *testing.T) {
193197

194198
// verify updates to updatable parameters
195199
{
196-
Config: config + compartmentIdVariableStr + VbInstanceResourceDependencies +
200+
Config: config + compartmentIdVariableStr + idcsOpenIdVariableStr() + vaultSecretIdStr + VbInstanceResourceDependencies +
197201
acctest.GenerateResourceFromRepresentationMap("oci_visual_builder_vb_instance", "test_vb_instance", acctest.Optional, acctest.Update, vbInstanceRepresentation),
198202
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
199-
resource.TestCheckResourceAttr(resourceName, "alternate_custom_endpoints.#", "1"),
200-
resource.TestCheckResourceAttrSet(resourceName, "alternate_custom_endpoints.0.certificate_secret_id"),
201-
resource.TestCheckResourceAttr(resourceName, "alternate_custom_endpoints.0.hostname", "hostname2"),
203+
//resource.TestCheckResourceAttr(resourceName, "alternate_custom_endpoints.#", "1"),
204+
//resource.TestCheckResourceAttrSet(resourceName, "alternate_custom_endpoints.0.certificate_secret_id"),
205+
//resource.TestCheckResourceAttr(resourceName, "alternate_custom_endpoints.0.hostname", "hostname2"),
202206
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
203207
resource.TestCheckResourceAttr(resourceName, "consumption_model", "UCM"),
204208
resource.TestCheckResourceAttr(resourceName, "custom_endpoint.#", "1"),
205209
resource.TestCheckResourceAttrSet(resourceName, "custom_endpoint.0.certificate_secret_id"),
206-
resource.TestCheckResourceAttr(resourceName, "custom_endpoint.0.hostname", "hostname2"),
210+
resource.TestCheckResourceAttr(resourceName, "custom_endpoint.0.hostname", "hostname2.com"),
207211
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"),
208212
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
209213
resource.TestCheckResourceAttrSet(resourceName, "id"),
210214
resource.TestCheckResourceAttrSet(resourceName, "idcs_open_id"),
211215
resource.TestCheckResourceAttrSet(resourceName, "instance_url"),
212216
resource.TestCheckResourceAttr(resourceName, "is_visual_builder_enabled", "true"),
213-
resource.TestCheckResourceAttr(resourceName, "node_count", "11"),
217+
resource.TestCheckResourceAttr(resourceName, "node_count", "2"),
214218
resource.TestCheckResourceAttrSet(resourceName, "state"),
215219

216220
func(s *terraform.State) (err error) {
@@ -226,12 +230,12 @@ func TestVisualBuilderVbInstanceResource_basic(t *testing.T) {
226230
{
227231
Config: config +
228232
acctest.GenerateDataSourceFromRepresentationMap("oci_visual_builder_vb_instances", "test_vb_instances", acctest.Optional, acctest.Update, vbInstanceDataSourceRepresentation) +
229-
compartmentIdVariableStr + VbInstanceResourceDependencies +
233+
compartmentIdVariableStr + idcsOpenIdVariableStr() + vaultSecretIdStr + VbInstanceResourceDependencies +
230234
acctest.GenerateResourceFromRepresentationMap("oci_visual_builder_vb_instance", "test_vb_instance", acctest.Optional, acctest.Update, vbInstanceRepresentation),
231235
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
232236
resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
233237
resource.TestCheckResourceAttr(datasourceName, "display_name", "displayName2"),
234-
resource.TestCheckResourceAttr(datasourceName, "state", "AVAILABLE"),
238+
resource.TestCheckResourceAttr(datasourceName, "state", "ACTIVE"),
235239

236240
resource.TestCheckResourceAttr(datasourceName, "vb_instance_summary_collection.#", "1"),
237241
resource.TestCheckResourceAttr(datasourceName, "vb_instance_summary_collection.0.items.#", "1"),
@@ -241,32 +245,47 @@ func TestVisualBuilderVbInstanceResource_basic(t *testing.T) {
241245
{
242246
Config: config +
243247
acctest.GenerateDataSourceFromRepresentationMap("oci_visual_builder_vb_instance", "test_vb_instance", acctest.Required, acctest.Create, vbInstanceSingularDataSourceRepresentation) +
244-
compartmentIdVariableStr + VbInstanceResourceConfig,
248+
compartmentIdVariableStr + idcsOpenIdVariableStr() + vaultSecretIdStr + VbInstanceResourceDependencies +
249+
acctest.GenerateResourceFromRepresentationMap("oci_visual_builder_vb_instance", "test_vb_instance", acctest.Optional, acctest.Update, vbInstanceRepresentation),
245250
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
246251
resource.TestCheckResourceAttrSet(singularDatasourceName, "vb_instance_id"),
247252

248-
resource.TestCheckResourceAttr(singularDatasourceName, "alternate_custom_endpoints.#", "1"),
249-
resource.TestCheckResourceAttrSet(singularDatasourceName, "alternate_custom_endpoints.0.certificate_secret_version"),
250-
resource.TestCheckResourceAttr(singularDatasourceName, "alternate_custom_endpoints.0.hostname", "hostname2"),
253+
//resource.TestCheckResourceAttr(singularDatasourceName, "alternate_custom_endpoints.#", "1"),
254+
//resource.TestCheckResourceAttrSet(singularDatasourceName, "alternate_custom_endpoints.0.certificate_secret_version"),
255+
//resource.TestCheckResourceAttr(singularDatasourceName, "alternate_custom_endpoints.0.hostname", "hostname2"),
251256
resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
252257
resource.TestCheckResourceAttr(singularDatasourceName, "consumption_model", "UCM"),
253258
resource.TestCheckResourceAttr(singularDatasourceName, "custom_endpoint.#", "1"),
254259
resource.TestCheckResourceAttrSet(singularDatasourceName, "custom_endpoint.0.certificate_secret_version"),
255-
resource.TestCheckResourceAttr(singularDatasourceName, "custom_endpoint.0.hostname", "hostname2"),
260+
resource.TestCheckResourceAttr(singularDatasourceName, "custom_endpoint.0.hostname", "hostname2.com"),
256261
resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "displayName2"),
257262
resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
258263
resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
259264
resource.TestCheckResourceAttrSet(singularDatasourceName, "instance_url"),
260265
resource.TestCheckResourceAttr(singularDatasourceName, "is_visual_builder_enabled", "true"),
261-
resource.TestCheckResourceAttr(singularDatasourceName, "node_count", "11"),
266+
resource.TestCheckResourceAttr(singularDatasourceName, "node_count", "2"),
262267
resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
263268
resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
264269
resource.TestCheckResourceAttrSet(singularDatasourceName, "time_updated"),
265270
),
266271
},
272+
// verify applications datasource
273+
{
274+
Config: config +
275+
acctest.GenerateDataSourceFromRepresentationMap("oci_visual_builder_vb_instance_applications", "test_vb_instance_applications", acctest.Required, acctest.Create, vbInstanceApplicationsSingularDataSourceRepresentation) +
276+
compartmentIdVariableStr + idcsOpenIdVariableStr() + vaultSecretIdStr + VbInstanceResourceDependencies +
277+
acctest.GenerateResourceFromRepresentationMap("oci_visual_builder_vb_instance", "test_vb_instance", acctest.Optional, acctest.Update, vbInstanceRepresentation),
278+
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
279+
// Don't know what to test as the data source will be empty because there will be error using this idcs token
280+
// The datasource returns {}
281+
func(s *terraform.State) (err error) {
282+
return nil
283+
},
284+
),
285+
},
267286
// remove singular datasource from previous step so that it doesn't conflict with import tests
268287
{
269-
Config: config + compartmentIdVariableStr + VbInstanceResourceConfig,
288+
Config: config + compartmentIdVariableStr + idcsOpenIdVariableStr() + vaultSecretIdStr + VbInstanceResourceConfig,
270289
},
271290
// verify resource import
272291
{
@@ -401,3 +420,8 @@ func vbInstanceSweepResponseFetchOperation(client *tf_client.OracleClients, reso
401420
})
402421
return err
403422
}
423+
424+
func idcsOpenIdVariableStr() string {
425+
idcsAccessToken := utils.GetEnvSettingWithBlankDefault("idcs_access_token")
426+
return fmt.Sprintf("variable \"idcs_access_token\" { default = \"%s\" }\n", idcsAccessToken)
427+
}

‎internal/provider/register_datasource.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -976,6 +976,8 @@ func init() {
976976
RegisterDatasource("oci_vault_secrets", tf_vault.VaultSecretsDataSource())
977977
// visual_builder service
978978
RegisterDatasource("oci_visual_builder_vb_instance", tf_visual_builder.VisualBuilderVbInstanceDataSource())
979+
RegisterDatasource("oci_visual_builder_vb_instances", tf_visual_builder.VisualBuilderVbInstancesDataSource())
980+
RegisterDatasource("oci_visual_builder_vb_instance_applications", tf_visual_builder.VisualBuilderVbInstanceApplicationsDataSource())
979981
// vulnerability_scanning service
980982
RegisterDatasource("oci_vulnerability_scanning_container_scan_recipe", tf_vulnerability_scanning.VulnerabilityScanningContainerScanRecipeDataSource())
981983
RegisterDatasource("oci_vulnerability_scanning_container_scan_recipes", tf_vulnerability_scanning.VulnerabilityScanningContainerScanRecipesDataSource())

‎internal/service/visual_builder/visual_builder_vb_instance_resource.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@ func getErrorFromVisualBuilderVbInstanceWorkRequest(client *oci_visual_builder.V
411411
response, err := client.ListWorkRequestErrors(context.Background(),
412412
oci_visual_builder.ListWorkRequestErrorsRequest{
413413
CompartmentId: compartmentId,
414+
WorkRequestId: workId,
414415
RequestMetadata: oci_common.RequestMetadata{
415416
RetryPolicy: retryPolicy,
416417
},

0 commit comments

Comments
 (0)