Skip to content

Commit 00074a1

Browse files
jotruonjotruon
committed
Using resource name to look up the service name
1 parent 8ad89c2 commit 00074a1

File tree

111 files changed

+557
-140
lines changed

Some content is hidden

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

111 files changed

+557
-140
lines changed

‎go.sum‎

Lines changed: 44 additions & 50 deletions
Large diffs are not rendered by default.

‎oci/analytics_analytics_instance_test.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package oci
55
import (
66
"context"
77
"fmt"
8+
"strconv"
89
"strings"
910
"testing"
1011
"time"
@@ -148,6 +149,11 @@ func TestAnalyticsAnalyticsInstanceResource_basic(t *testing.T) {
148149

149150
func(s *terraform.State) (err error) {
150151
resId, err = fromInstanceState(s, resourceName, "id")
152+
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
153+
if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
154+
return errExport
155+
}
156+
}
151157
return err
152158
},
153159
),

‎oci/audit_configuration_test.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package oci
44

55
import (
66
"fmt"
7+
"strconv"
78
"testing"
89

910
"github.com/hashicorp/terraform/helper/resource"
@@ -59,6 +60,11 @@ func TestAuditConfigurationResource_basic(t *testing.T) {
5960

6061
func(s *terraform.State) (err error) {
6162
resId, err = fromInstanceState(s, resourceName, "id")
63+
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
64+
if errExport := testExportCompartmentWithResourceName(&resId, &tenancyId, resourceName); errExport != nil {
65+
return errExport
66+
}
67+
}
6268
return err
6369
},
6470
),

‎oci/autoscaling_auto_scaling_configuration_test.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package oci
55
import (
66
"context"
77
"fmt"
8+
"strconv"
89
"testing"
910

1011
"github.com/hashicorp/terraform/helper/resource"
@@ -229,6 +230,11 @@ func TestAutoScalingAutoScalingConfigurationResource_basic(t *testing.T) {
229230

230231
func(s *terraform.State) (err error) {
231232
resId, err = fromInstanceState(s, resourceName, "id")
233+
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
234+
if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
235+
return errExport
236+
}
237+
}
232238
return err
233239
},
234240
),

‎oci/budget_alert_rule_test.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package oci
55
import (
66
"context"
77
"fmt"
8+
"strconv"
89
"testing"
910

1011
"github.com/hashicorp/terraform/helper/resource"
@@ -122,6 +123,11 @@ func TestBudgetAlertRuleResource_basic(t *testing.T) {
122123

123124
func(s *terraform.State) (err error) {
124125
resId, err = fromInstanceState(s, resourceName, "id")
126+
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
127+
if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
128+
return errExport
129+
}
130+
}
125131
return err
126132
},
127133
),

‎oci/budget_budget_test.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package oci
55
import (
66
"context"
77
"fmt"
8+
"strconv"
89
"testing"
910

1011
"github.com/hashicorp/terraform/helper/resource"
@@ -301,6 +302,11 @@ func TestBudgetBudgetResource_basic(t *testing.T) {
301302

302303
func(s *terraform.State) (err error) {
303304
resId, err = fromInstanceState(s, resourceName, "id")
305+
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
306+
if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
307+
return errExport
308+
}
309+
}
304310
return err
305311
},
306312
),

‎oci/containerengine_cluster_test.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package oci
55
import (
66
"context"
77
"fmt"
8+
"strconv"
89
"testing"
910
"time"
1011

@@ -131,6 +132,11 @@ func TestContainerengineClusterResource_basic(t *testing.T) {
131132

132133
func(s *terraform.State) (err error) {
133134
resId, err = fromInstanceState(s, resourceName, "id")
135+
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
136+
if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
137+
return errExport
138+
}
139+
}
134140
return err
135141
},
136142
),

‎oci/containerengine_node_pool_test.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package oci
55
import (
66
"context"
77
"fmt"
8+
"strconv"
89
"testing"
910

1011
"github.com/hashicorp/terraform/helper/resource"
@@ -194,6 +195,11 @@ func TestContainerengineNodePoolResource_basic(t *testing.T) {
194195

195196
func(s *terraform.State) (err error) {
196197
resId, err = fromInstanceState(s, resourceName, "id")
198+
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
199+
if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
200+
return errExport
201+
}
202+
}
197203
resIdCreatedWithImageId, err = fromInstanceState(s, resourceNameForImageId, "id")
198204
return err
199205
},

‎oci/core_boot_volume_backup_test.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package oci
55
import (
66
"context"
77
"fmt"
8+
"strconv"
89
"testing"
910
"time"
1011

@@ -118,6 +119,11 @@ func TestCoreBootVolumeBackupResource_basic(t *testing.T) {
118119

119120
func(s *terraform.State) (err error) {
120121
resId, err = fromInstanceState(s, resourceName, "id")
122+
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
123+
if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
124+
return errExport
125+
}
126+
}
121127
return err
122128
},
123129
),

‎oci/core_boot_volume_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ func TestCoreBootVolumeResource_basic(t *testing.T) {
149149
func(s *terraform.State) (err error) {
150150
resId, err = fromInstanceState(s, resourceName, "id")
151151
if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
152-
if errExport := testExportCompartment(&resId, &compartmentId); errExport != nil {
152+
if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
153153
return errExport
154154
}
155155
}

0 commit comments

Comments
 (0)