Skip to content

Commit c787307

Browse files
Ravi Tandoncodycushing
Ravi Tandon
authored and
codycushing
committed
Updated Test Asserts
1 parent 0e6a7b8 commit c787307

File tree

88 files changed

+451
-183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+451
-183
lines changed

‎oci/audit_audit_event_test.go‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,21 @@ func TestAuditAuditEventResource_basic(t *testing.T) {
5252
resource.TestCheckResourceAttrSet(datasourceName, "start_time"),
5353

5454
resource.TestCheckResourceAttrSet(datasourceName, "audit_events.#"),
55+
resource.TestCheckResourceAttrSet(datasourceName, "audit_events.0.compartment_id"),
56+
resource.TestCheckResourceAttrSet(datasourceName, "audit_events.0.event_id"),
57+
resource.TestCheckResourceAttrSet(datasourceName, "audit_events.0.event_name"),
58+
resource.TestCheckResourceAttrSet(datasourceName, "audit_events.0.event_source"),
59+
resource.TestCheckResourceAttrSet(datasourceName, "audit_events.0.event_time"),
60+
resource.TestCheckResourceAttrSet(datasourceName, "audit_events.0.event_type"),
61+
resource.TestCheckResourceAttrSet(datasourceName, "audit_events.0.principal_id"),
62+
resource.TestCheckResourceAttrSet(datasourceName, "audit_events.0.request_action"),
63+
resource.TestCheckResourceAttrSet(datasourceName, "audit_events.0.request_agent"),
64+
resource.TestCheckResourceAttrSet(datasourceName, "audit_events.0.request_id"),
65+
resource.TestCheckResourceAttrSet(datasourceName, "audit_events.0.request_origin"),
66+
resource.TestCheckResourceAttrSet(datasourceName, "audit_events.0.request_resource"),
67+
resource.TestCheckResourceAttrSet(datasourceName, "audit_events.0.response_status"),
68+
resource.TestCheckResourceAttrSet(datasourceName, "audit_events.0.response_time"),
69+
resource.TestCheckResourceAttrSet(datasourceName, "audit_events.0.tenant_id"),
5570
),
5671
},
5772
},

‎oci/audit_configuration_test.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ func TestAuditConfigurationResource_basic(t *testing.T) {
3535
provider := testAccProvider
3636
config := testProviderConfig()
3737

38+
tenancyId := getEnvSettingWithBlankDefault("tenancy_ocid")
39+
3840
resourceName := "oci_audit_configuration.test_configuration"
3941

4042
singularDatasourceName := "data.oci_audit_configuration.test_configuration"
@@ -81,9 +83,9 @@ func TestAuditConfigurationResource_basic(t *testing.T) {
8183
generateDataSourceFromRepresentationMap("oci_audit_configuration", "test_configuration", Required, Create, configurationSingularDataSourceRepresentation) +
8284
ConfigurationResourceConfig,
8385
Check: resource.ComposeAggregateTestCheckFunc(
84-
resource.TestCheckResourceAttrSet(singularDatasourceName, "compartment_id"),
86+
resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", tenancyId),
8587

86-
resource.TestCheckResourceAttr(singularDatasourceName, "retention_period_days", "91"),
88+
resource.TestCheckResourceAttrSet(singularDatasourceName, "retention_period_days"),
8789
),
8890
},
8991
},

‎oci/autoscaling_auto_scaling_configuration_data_source.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,16 @@ func (s *AutoscalingAutoScalingConfigurationDataSourceCrud) SetData() error {
6262

6363
s.D.SetId(*s.Res.Id)
6464

65+
if s.Res.Resource != nil {
66+
autoScalingResourcesArray := []interface{}{}
67+
if autoScalingResourcesMap := ResourceToMap(&s.Res.Resource); autoScalingResourcesMap != nil {
68+
autoScalingResourcesArray = append(autoScalingResourcesArray, autoScalingResourcesMap)
69+
}
70+
s.D.Set("auto_scaling_resources", autoScalingResourcesArray)
71+
} else {
72+
s.D.Set("auto_scaling_resources", nil)
73+
}
74+
6575
if s.Res.CompartmentId != nil {
6676
s.D.Set("compartment_id", *s.Res.CompartmentId)
6777
}
@@ -90,16 +100,6 @@ func (s *AutoscalingAutoScalingConfigurationDataSourceCrud) SetData() error {
90100
}
91101
s.D.Set("policies", policies)
92102

93-
if s.Res.Resource != nil {
94-
resourceArray := []interface{}{}
95-
if resourceMap := ResourceToMap(&s.Res.Resource); resourceMap != nil {
96-
resourceArray = append(resourceArray, resourceMap)
97-
}
98-
s.D.Set("auto_scaling_resources", resourceArray)
99-
} else {
100-
s.D.Set("auto_scaling_resources", nil)
101-
}
102-
103103
if s.Res.TimeCreated != nil {
104104
s.D.Set("time_created", s.Res.TimeCreated.String())
105105
}

‎oci/autoscaling_auto_scaling_configuration_resource.go‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,32 @@ func AutoscalingAutoScalingConfigurationResource() *schema.Resource {
2929
Delete: deleteAutoscalingAutoScalingConfiguration,
3030
Schema: map[string]*schema.Schema{
3131
// Required
32+
"auto_scaling_resources": {
33+
Type: schema.TypeList,
34+
Required: true,
35+
ForceNew: true,
36+
MaxItems: 1,
37+
MinItems: 1,
38+
Elem: &schema.Resource{
39+
Schema: map[string]*schema.Schema{
40+
// Required
41+
"id": {
42+
Type: schema.TypeString,
43+
Required: true,
44+
ForceNew: true,
45+
},
46+
"type": {
47+
Type: schema.TypeString,
48+
Required: true,
49+
ForceNew: true,
50+
},
51+
52+
// Optional
53+
54+
// Computed
55+
},
56+
},
57+
},
3258
"compartment_id": {
3359
Type: schema.TypeString,
3460
Required: true,
@@ -198,32 +224,6 @@ func AutoscalingAutoScalingConfigurationResource() *schema.Resource {
198224
},
199225
},
200226
},
201-
"auto_scaling_resources": {
202-
Type: schema.TypeList,
203-
Required: true,
204-
ForceNew: true,
205-
MaxItems: 1,
206-
MinItems: 1,
207-
Elem: &schema.Resource{
208-
Schema: map[string]*schema.Schema{
209-
// Required
210-
"id": {
211-
Type: schema.TypeString,
212-
Required: true,
213-
ForceNew: true,
214-
},
215-
"type": {
216-
Type: schema.TypeString,
217-
Required: true,
218-
ForceNew: true,
219-
},
220-
221-
// Optional
222-
223-
// Computed
224-
},
225-
},
226-
},
227227

228228
// Optional
229229
"cool_down_in_seconds": {
@@ -311,6 +311,17 @@ func (s *AutoscalingAutoScalingConfigurationResourceCrud) ID() string {
311311
func (s *AutoscalingAutoScalingConfigurationResourceCrud) Create() error {
312312
request := oci_autoscaling.CreateAutoScalingConfigurationRequest{}
313313

314+
if autoScalingResources, ok := s.D.GetOkExists("auto_scaling_resources"); ok {
315+
if tmpList := autoScalingResources.([]interface{}); len(tmpList) > 0 {
316+
fieldKeyFormat := fmt.Sprintf("%s.%d.%%s", "auto_scaling_resources", 0)
317+
tmp, err := s.mapToResource(fieldKeyFormat)
318+
if err != nil {
319+
return err
320+
}
321+
request.Resource = tmp
322+
}
323+
}
324+
314325
if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
315326
tmp := compartmentId.(string)
316327
request.CompartmentId = &tmp
@@ -359,17 +370,6 @@ func (s *AutoscalingAutoScalingConfigurationResourceCrud) Create() error {
359370
request.Policies = tmp
360371
}
361372

362-
if resource_, ok := s.D.GetOkExists("auto_scaling_resources"); ok {
363-
if tmpList := resource_.([]interface{}); len(tmpList) > 0 {
364-
fieldKeyFormat := fmt.Sprintf("%s.%d.%%s", "auto_scaling_resources", 0)
365-
tmp, err := s.mapToResource(fieldKeyFormat)
366-
if err != nil {
367-
return err
368-
}
369-
request.Resource = tmp
370-
}
371-
}
372-
373373
request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "autoscaling")
374374

375375
response, err := s.Client.CreateAutoScalingConfiguration(context.Background(), request)
@@ -455,6 +455,16 @@ func (s *AutoscalingAutoScalingConfigurationResourceCrud) Delete() error {
455455
}
456456

457457
func (s *AutoscalingAutoScalingConfigurationResourceCrud) SetData() error {
458+
if s.Res.Resource != nil {
459+
autoScalingResourcesArray := []interface{}{}
460+
if autoScalingResourcesMap := ResourceToMap(&s.Res.Resource); autoScalingResourcesMap != nil {
461+
autoScalingResourcesArray = append(autoScalingResourcesArray, autoScalingResourcesMap)
462+
}
463+
s.D.Set("auto_scaling_resources", autoScalingResourcesArray)
464+
} else {
465+
s.D.Set("auto_scaling_resources", nil)
466+
}
467+
458468
if s.Res.CompartmentId != nil {
459469
s.D.Set("compartment_id", *s.Res.CompartmentId)
460470
}
@@ -483,16 +493,6 @@ func (s *AutoscalingAutoScalingConfigurationResourceCrud) SetData() error {
483493
}
484494
s.D.Set("policies", policies)
485495

486-
if s.Res.Resource != nil {
487-
resourceArray := []interface{}{}
488-
if resourceMap := ResourceToMap(&s.Res.Resource); resourceMap != nil {
489-
resourceArray = append(resourceArray, resourceMap)
490-
}
491-
s.D.Set("auto_scaling_resources", resourceArray)
492-
} else {
493-
s.D.Set("auto_scaling_resources", nil)
494-
}
495-
496496
if s.Res.TimeCreated != nil {
497497
s.D.Set("time_created", s.Res.TimeCreated.String())
498498
}

‎oci/autoscaling_auto_scaling_configuration_test.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,25 @@ var (
3636
}
3737

3838
autoScalingConfigurationRepresentation = map[string]interface{}{
39+
"auto_scaling_resources": RepresentationGroup{Required, autoScalingConfigurationAutoScalingResourcesRepresentation},
3940
"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
4041
"policies": RepresentationGroup{Required, autoScalingConfigurationPoliciesRepresentation},
41-
"auto_scaling_resources": RepresentationGroup{Required, autoScalingConfigurationResourceRepresentation},
4242
"cool_down_in_seconds": Representation{repType: Optional, create: `300`, update: `400`},
4343
"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")}`},
4444
"display_name": Representation{repType: Optional, create: `displayName`, update: `displayName2`},
4545
"freeform_tags": Representation{repType: Optional, create: map[string]string{"Department": "Finance"}, update: map[string]string{"Department": "Accounting"}},
4646
"is_enabled": Representation{repType: Optional, create: `false`, update: `true`},
4747
}
48+
autoScalingConfigurationAutoScalingResourcesRepresentation = map[string]interface{}{
49+
"id": Representation{repType: Required, create: `${oci_core_instance_pool.test_instance_pool.id}`},
50+
"type": Representation{repType: Required, create: `instancePool`},
51+
}
4852
autoScalingConfigurationPoliciesRepresentation = map[string]interface{}{
4953
"capacity": RepresentationGroup{Required, autoScalingConfigurationPoliciesCapacityRepresentation},
5054
"policy_type": Representation{repType: Required, create: `threshold`, update: `threshold`},
5155
"rules": []RepresentationGroup{{Required, autoScalingConfigurationPoliciesScaleOutRuleRepresentation}, {Required, autoScalingConfigurationPoliciesScaleInRuleRepresentation}},
5256
"display_name": Representation{repType: Optional, create: `displayName`, update: `displayName2`},
5357
}
54-
autoScalingConfigurationResourceRepresentation = map[string]interface{}{
55-
"id": Representation{repType: Required, create: `${oci_core_instance_pool.test_instance_pool.id}`},
56-
"type": Representation{repType: Required, create: `instancePool`},
57-
}
5858
autoScalingConfigurationPoliciesCapacityRepresentation = map[string]interface{}{
5959
"initial": Representation{repType: Required, create: `2`, update: `4`},
6060
"max": Representation{repType: Required, create: `3`, update: `5`},
@@ -127,6 +127,9 @@ func TestAutoscalingAutoScalingConfigurationResource_basic(t *testing.T) {
127127
Config: config + compartmentIdVariableStr + AutoScalingConfigurationResourceDependencies +
128128
generateResourceFromRepresentationMap("oci_autoscaling_auto_scaling_configuration", "test_auto_scaling_configuration", Required, Create, autoScalingConfigurationRepresentation),
129129
Check: resource.ComposeAggregateTestCheckFunc(
130+
resource.TestCheckResourceAttr(resourceName, "auto_scaling_resources.#", "1"),
131+
resource.TestCheckResourceAttrSet(resourceName, "auto_scaling_resources.0.id"),
132+
resource.TestCheckResourceAttr(resourceName, "auto_scaling_resources.0.type", "instancePool"),
130133
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
131134
resource.TestCheckResourceAttr(resourceName, "policies.#", "1"),
132135
resource.TestCheckResourceAttr(resourceName, "policies.0.capacity.#", "1"),
@@ -157,9 +160,6 @@ func TestAutoscalingAutoScalingConfigurationResource_basic(t *testing.T) {
157160
"metric.0.threshold.0.value": "1",
158161
},
159162
[]string{}),
160-
resource.TestCheckResourceAttr(resourceName, "auto_scaling_resources.#", "1"),
161-
resource.TestCheckResourceAttrSet(resourceName, "auto_scaling_resources.0.id"),
162-
resource.TestCheckResourceAttr(resourceName, "auto_scaling_resources.0.type", "instancePool"),
163163

164164
func(s *terraform.State) (err error) {
165165
resId, err = fromInstanceState(s, resourceName, "id")
@@ -177,6 +177,9 @@ func TestAutoscalingAutoScalingConfigurationResource_basic(t *testing.T) {
177177
Config: config + compartmentIdVariableStr + AutoScalingConfigurationResourceDependencies +
178178
generateResourceFromRepresentationMap("oci_autoscaling_auto_scaling_configuration", "test_auto_scaling_configuration", Optional, Create, autoScalingConfigurationRepresentation),
179179
Check: resource.ComposeAggregateTestCheckFunc(
180+
resource.TestCheckResourceAttr(resourceName, "auto_scaling_resources.#", "1"),
181+
resource.TestCheckResourceAttrSet(resourceName, "auto_scaling_resources.0.id"),
182+
resource.TestCheckResourceAttr(resourceName, "auto_scaling_resources.0.type", "instancePool"),
180183
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
181184
resource.TestCheckResourceAttr(resourceName, "cool_down_in_seconds", "300"),
182185
resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
@@ -218,9 +221,6 @@ func TestAutoscalingAutoScalingConfigurationResource_basic(t *testing.T) {
218221
},
219222
[]string{}),
220223
resource.TestCheckResourceAttrSet(resourceName, "policies.0.time_created"),
221-
resource.TestCheckResourceAttr(resourceName, "auto_scaling_resources.#", "1"),
222-
resource.TestCheckResourceAttrSet(resourceName, "auto_scaling_resources.0.id"),
223-
resource.TestCheckResourceAttr(resourceName, "auto_scaling_resources.0.type", "instancePool"),
224224
resource.TestCheckResourceAttrSet(resourceName, "time_created"),
225225

226226
func(s *terraform.State) (err error) {
@@ -235,6 +235,9 @@ func TestAutoscalingAutoScalingConfigurationResource_basic(t *testing.T) {
235235
Config: config + compartmentIdVariableStr + AutoScalingConfigurationResourceDependencies +
236236
generateResourceFromRepresentationMap("oci_autoscaling_auto_scaling_configuration", "test_auto_scaling_configuration", Optional, Update, autoScalingConfigurationRepresentation),
237237
Check: resource.ComposeAggregateTestCheckFunc(
238+
resource.TestCheckResourceAttr(resourceName, "auto_scaling_resources.#", "1"),
239+
resource.TestCheckResourceAttrSet(resourceName, "auto_scaling_resources.0.id"),
240+
resource.TestCheckResourceAttr(resourceName, "auto_scaling_resources.0.type", "instancePool"),
238241
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
239242
resource.TestCheckResourceAttr(resourceName, "cool_down_in_seconds", "400"),
240243
resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
@@ -276,9 +279,6 @@ func TestAutoscalingAutoScalingConfigurationResource_basic(t *testing.T) {
276279
},
277280
[]string{}),
278281
resource.TestCheckResourceAttrSet(resourceName, "policies.0.time_created"),
279-
resource.TestCheckResourceAttr(resourceName, "auto_scaling_resources.#", "1"),
280-
resource.TestCheckResourceAttrSet(resourceName, "auto_scaling_resources.0.id"),
281-
resource.TestCheckResourceAttr(resourceName, "auto_scaling_resources.0.type", "instancePool"),
282282
resource.TestCheckResourceAttrSet(resourceName, "time_created"),
283283

284284
func(s *terraform.State) (err error) {
@@ -301,14 +301,14 @@ func TestAutoscalingAutoScalingConfigurationResource_basic(t *testing.T) {
301301
resource.TestCheckResourceAttr(datasourceName, "display_name", "displayName2"),
302302

303303
resource.TestCheckResourceAttr(datasourceName, "auto_scaling_configurations.#", "1"),
304+
resource.TestCheckResourceAttr(datasourceName, "auto_scaling_configurations.0.auto_scaling_resources.#", "1"),
305+
resource.TestCheckResourceAttrSet(datasourceName, "auto_scaling_configurations.0.auto_scaling_resources.0.id"),
306+
resource.TestCheckResourceAttr(datasourceName, "auto_scaling_configurations.0.auto_scaling_resources.0.type", "instancePool"),
304307
resource.TestCheckResourceAttr(datasourceName, "auto_scaling_configurations.0.compartment_id", compartmentId),
305308
resource.TestCheckResourceAttr(datasourceName, "auto_scaling_configurations.0.cool_down_in_seconds", "400"),
306309
resource.TestCheckResourceAttr(datasourceName, "auto_scaling_configurations.0.display_name", "displayName2"),
307310
resource.TestCheckResourceAttrSet(datasourceName, "auto_scaling_configurations.0.id"),
308311
resource.TestCheckResourceAttr(datasourceName, "auto_scaling_configurations.0.is_enabled", "true"),
309-
resource.TestCheckResourceAttr(datasourceName, "auto_scaling_configurations.0.auto_scaling_resources.#", "1"),
310-
resource.TestCheckResourceAttrSet(datasourceName, "auto_scaling_configurations.0.auto_scaling_resources.0.id"),
311-
resource.TestCheckResourceAttr(datasourceName, "auto_scaling_configurations.0.auto_scaling_resources.0.type", "instancePool"),
312312
resource.TestCheckResourceAttrSet(datasourceName, "auto_scaling_configurations.0.time_created"),
313313
),
314314
},
@@ -320,6 +320,9 @@ func TestAutoscalingAutoScalingConfigurationResource_basic(t *testing.T) {
320320
Check: resource.ComposeAggregateTestCheckFunc(
321321
resource.TestCheckResourceAttrSet(singularDatasourceName, "auto_scaling_configuration_id"),
322322

323+
resource.TestCheckResourceAttr(singularDatasourceName, "auto_scaling_resources.#", "1"),
324+
resource.TestCheckResourceAttrSet(singularDatasourceName, "auto_scaling_resources.0.id"),
325+
resource.TestCheckResourceAttr(singularDatasourceName, "auto_scaling_resources.0.type", "instancePool"),
323326
resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
324327
resource.TestCheckResourceAttr(singularDatasourceName, "cool_down_in_seconds", "400"),
325328
resource.TestCheckResourceAttr(singularDatasourceName, "defined_tags.%", "1"),
@@ -360,9 +363,6 @@ func TestAutoscalingAutoScalingConfigurationResource_basic(t *testing.T) {
360363
},
361364
[]string{}),
362365
resource.TestCheckResourceAttrSet(singularDatasourceName, "policies.0.time_created"),
363-
resource.TestCheckResourceAttr(singularDatasourceName, "auto_scaling_resources.#", "1"),
364-
resource.TestCheckResourceAttrSet(singularDatasourceName, "auto_scaling_resources.0.id"),
365-
resource.TestCheckResourceAttr(singularDatasourceName, "auto_scaling_resources.0.type", "instancePool"),
366366
resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
367367
),
368368
},

‎oci/budget_alert_rule_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ func TestBudgetAlertRuleResource_basic(t *testing.T) {
180180
resource.TestCheckResourceAttrSet(datasourceName, "alert_rules.0.time_created"),
181181
resource.TestCheckResourceAttrSet(datasourceName, "alert_rules.0.time_updated"),
182182
resource.TestCheckResourceAttr(datasourceName, "alert_rules.0.type", "FORECAST"),
183+
resource.TestCheckResourceAttrSet(datasourceName, "alert_rules.0.version"),
183184
),
184185
},
185186
// verify singular datasource
@@ -204,6 +205,7 @@ func TestBudgetAlertRuleResource_basic(t *testing.T) {
204205
resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
205206
resource.TestCheckResourceAttrSet(singularDatasourceName, "time_updated"),
206207
resource.TestCheckResourceAttr(singularDatasourceName, "type", "FORECAST"),
208+
resource.TestCheckResourceAttrSet(singularDatasourceName, "version"),
207209
),
208210
},
209211
// remove singular datasource from previous step so that it doesn't conflict with import tests

0 commit comments

Comments
 (0)