Skip to content

Commit 5bc65dc

Browse files
jotruonjotruon
committed
Added - Support for EM Warehouse resourceUsage API Addendum:coreUser[API CHANGE ONLY]
1 parent 4bf79d8 commit 5bc65dc

9 files changed

+47
-28
lines changed

‎internal/client/em_warehouse_clients.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
)
1111

1212
func init() {
13-
RegisterOracleClient("oci_em_warehouse.EmDataLakeClient", &OracleClient{InitClientFn: initEmwarehouseEmDataLakeClient})
13+
RegisterOracleClient("oci_em_warehouse.EmWarehouseClient", &OracleClient{InitClientFn: initEmwarehouseEmWarehouseClient})
1414
}
1515

16-
func initEmwarehouseEmDataLakeClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
17-
client, err := oci_em_warehouse.NewEmDataLakeClientWithConfigurationProvider(configProvider)
16+
func initEmwarehouseEmWarehouseClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
17+
client, err := oci_em_warehouse.NewEmWarehouseClientWithConfigurationProvider(configProvider)
1818
if err != nil {
1919
return nil, err
2020
}
@@ -29,6 +29,6 @@ func initEmwarehouseEmDataLakeClient(configProvider oci_common.ConfigurationProv
2929
return &client, nil
3030
}
3131

32-
func (m *OracleClients) EmDataLakeClient() *oci_em_warehouse.EmDataLakeClient {
33-
return m.GetClient("oci_em_warehouse.EmDataLakeClient").(*oci_em_warehouse.EmDataLakeClient)
32+
func (m *OracleClients) EmWarehouseClient() *oci_em_warehouse.EmWarehouseClient {
33+
return m.GetClient("oci_em_warehouse.EmWarehouseClient").(*oci_em_warehouse.EmWarehouseClient)
3434
}

‎internal/integrationtest/em_warehouse_em_warehouse_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ func TestEmWarehouseEmWarehouseResource_basic(t *testing.T) {
244244

245245
func testAccCheckEmWarehouseEmWarehouseDestroy(s *terraform.State) error {
246246
noResourceFound := true
247-
client := acctest.TestAccProvider.Meta().(*tf_client.OracleClients).EmDataLakeClient()
247+
client := acctest.TestAccProvider.Meta().(*tf_client.OracleClients).EmWarehouseClient()
248248
for _, rs := range s.RootModule().Resources {
249249
if rs.Type == "oci_em_warehouse_em_warehouse" {
250250
noResourceFound = false
@@ -296,7 +296,7 @@ func init() {
296296
}
297297

298298
func sweepEmWarehouseEmWarehouseResource(compartment string) error {
299-
emDataLakeClient := acctest.GetTestClients(&schema.ResourceData{}).EmDataLakeClient()
299+
emWarehouseClient := acctest.GetTestClients(&schema.ResourceData{}).EmWarehouseClient()
300300
emWarehouseIds, err := getEmWarehouseIds(compartment)
301301
if err != nil {
302302
return err
@@ -308,7 +308,7 @@ func sweepEmWarehouseEmWarehouseResource(compartment string) error {
308308
deleteEmWarehouseRequest.EmWarehouseId = &emWarehouseId
309309

310310
deleteEmWarehouseRequest.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(true, "em_warehouse")
311-
_, error := emDataLakeClient.DeleteEmWarehouse(context.Background(), deleteEmWarehouseRequest)
311+
_, error := emWarehouseClient.DeleteEmWarehouse(context.Background(), deleteEmWarehouseRequest)
312312
if error != nil {
313313
fmt.Printf("Error deleting EmWarehouse %s %s, It is possible that the resource is already deleted. Please verify manually \n", emWarehouseId, error)
314314
continue
@@ -327,12 +327,12 @@ func getEmWarehouseIds(compartment string) ([]string, error) {
327327
}
328328
var resourceIds []string
329329
compartmentId := compartment
330-
emDataLakeClient := acctest.GetTestClients(&schema.ResourceData{}).EmDataLakeClient()
330+
emWarehouseClient := acctest.GetTestClients(&schema.ResourceData{}).EmWarehouseClient()
331331

332332
listEmWarehousesRequest := oci_em_warehouse.ListEmWarehousesRequest{}
333333
listEmWarehousesRequest.CompartmentId = &compartmentId
334334
listEmWarehousesRequest.LifecycleState = oci_em_warehouse.EmWarehouseLifecycleStateActive
335-
listEmWarehousesResponse, err := emDataLakeClient.ListEmWarehouses(context.Background(), listEmWarehousesRequest)
335+
listEmWarehousesResponse, err := emWarehouseClient.ListEmWarehouses(context.Background(), listEmWarehousesRequest)
336336

337337
if err != nil {
338338
return resourceIds, fmt.Errorf("Error getting EmWarehouse list for compartment id : %s , %s \n", compartmentId, err)
@@ -354,7 +354,7 @@ func emWarehouseSweepWaitCondition(response common.OCIOperationResponse) bool {
354354
}
355355

356356
func emWarehouseSweepResponseFetchOperation(client *tf_client.OracleClients, resourceId *string, retryPolicy *common.RetryPolicy) error {
357-
_, err := client.EmDataLakeClient().GetEmWarehouse(context.Background(), oci_em_warehouse.GetEmWarehouseRequest{
357+
_, err := client.EmWarehouseClient().GetEmWarehouse(context.Background(), oci_em_warehouse.GetEmWarehouseRequest{
358358
EmWarehouseId: resourceId,
359359
RequestMetadata: common.RequestMetadata{
360360
RetryPolicy: retryPolicy,

‎internal/service/em_warehouse/em_warehouse_em_warehouse_data_source.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ func EmWarehouseEmWarehouseDataSource() *schema.Resource {
2525
func readSingularEmWarehouseEmWarehouse(d *schema.ResourceData, m interface{}) error {
2626
sync := &EmWarehouseEmWarehouseDataSourceCrud{}
2727
sync.D = d
28-
sync.Client = m.(*client.OracleClients).EmDataLakeClient()
28+
sync.Client = m.(*client.OracleClients).EmWarehouseClient()
2929

3030
return tfresource.ReadResource(sync)
3131
}
3232

3333
type EmWarehouseEmWarehouseDataSourceCrud struct {
3434
D *schema.ResourceData
35-
Client *oci_em_warehouse.EmDataLakeClient
35+
Client *oci_em_warehouse.EmWarehouseClient
3636
Res *oci_em_warehouse.GetEmWarehouseResponse
3737
}
3838

‎internal/service/em_warehouse/em_warehouse_em_warehouse_etl_run_data_source.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@ func EmWarehouseEmWarehouseEtlRunDataSource() *schema.Resource {
9797
func readSingularEmWarehouseEmWarehouseEtlRun(d *schema.ResourceData, m interface{}) error {
9898
sync := &EmWarehouseEmWarehouseEtlRunDataSourceCrud{}
9999
sync.D = d
100-
sync.Client = m.(*client.OracleClients).EmDataLakeClient()
100+
sync.Client = m.(*client.OracleClients).EmWarehouseClient()
101101

102102
return tfresource.ReadResource(sync)
103103
}
104104

105105
type EmWarehouseEmWarehouseEtlRunDataSourceCrud struct {
106106
D *schema.ResourceData
107-
Client *oci_em_warehouse.EmDataLakeClient
107+
Client *oci_em_warehouse.EmWarehouseClient
108108
Res *oci_em_warehouse.ListEtlRunsResponse
109109
}
110110

‎internal/service/em_warehouse/em_warehouse_em_warehouse_etl_runs_data_source.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,14 @@ func EmWarehouseEmWarehouseEtlRunsDataSource() *schema.Resource {
118118
func readEmWarehouseEmWarehouseEtlRuns(d *schema.ResourceData, m interface{}) error {
119119
sync := &EmWarehouseEmWarehouseEtlRunsDataSourceCrud{}
120120
sync.D = d
121-
sync.Client = m.(*client.OracleClients).EmDataLakeClient()
121+
sync.Client = m.(*client.OracleClients).EmWarehouseClient()
122122

123123
return tfresource.ReadResource(sync)
124124
}
125125

126126
type EmWarehouseEmWarehouseEtlRunsDataSourceCrud struct {
127127
D *schema.ResourceData
128-
Client *oci_em_warehouse.EmDataLakeClient
128+
Client *oci_em_warehouse.EmWarehouseClient
129129
Res *oci_em_warehouse.ListEtlRunsResponse
130130
}
131131

‎internal/service/em_warehouse/em_warehouse_em_warehouse_resource.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,39 +112,39 @@ func EmWarehouseEmWarehouseResource() *schema.Resource {
112112
func createEmWarehouseEmWarehouse(d *schema.ResourceData, m interface{}) error {
113113
sync := &EmWarehouseEmWarehouseResourceCrud{}
114114
sync.D = d
115-
sync.Client = m.(*client.OracleClients).EmDataLakeClient()
115+
sync.Client = m.(*client.OracleClients).EmWarehouseClient()
116116

117117
return tfresource.CreateResource(d, sync)
118118
}
119119

120120
func readEmWarehouseEmWarehouse(d *schema.ResourceData, m interface{}) error {
121121
sync := &EmWarehouseEmWarehouseResourceCrud{}
122122
sync.D = d
123-
sync.Client = m.(*client.OracleClients).EmDataLakeClient()
123+
sync.Client = m.(*client.OracleClients).EmWarehouseClient()
124124

125125
return tfresource.ReadResource(sync)
126126
}
127127

128128
func updateEmWarehouseEmWarehouse(d *schema.ResourceData, m interface{}) error {
129129
sync := &EmWarehouseEmWarehouseResourceCrud{}
130130
sync.D = d
131-
sync.Client = m.(*client.OracleClients).EmDataLakeClient()
131+
sync.Client = m.(*client.OracleClients).EmWarehouseClient()
132132

133133
return tfresource.UpdateResource(d, sync)
134134
}
135135

136136
func deleteEmWarehouseEmWarehouse(d *schema.ResourceData, m interface{}) error {
137137
sync := &EmWarehouseEmWarehouseResourceCrud{}
138138
sync.D = d
139-
sync.Client = m.(*client.OracleClients).EmDataLakeClient()
139+
sync.Client = m.(*client.OracleClients).EmWarehouseClient()
140140
sync.DisableNotFoundRetries = true
141141

142142
return tfresource.DeleteResource(d, sync)
143143
}
144144

145145
type EmWarehouseEmWarehouseResourceCrud struct {
146146
tfresource.BaseCrud
147-
Client *oci_em_warehouse.EmDataLakeClient
147+
Client *oci_em_warehouse.EmWarehouseClient
148148
Res *oci_em_warehouse.EmWarehouse
149149
DisableNotFoundRetries bool
150150
}
@@ -274,7 +274,8 @@ func emWarehouseWorkRequestShouldRetryFunc(timeout time.Duration) func(response
274274
}
275275

276276
func emWarehouseWaitForWorkRequest(wId *string, entityType string, action oci_em_warehouse.ActionTypeEnum,
277-
timeout time.Duration, disableFoundRetries bool, client *oci_em_warehouse.EmDataLakeClient) (*string, error) {
277+
timeout time.Duration, disableFoundRetries bool, client *oci_em_warehouse.EmWarehouseClient) (*string, error) {
278+
278279
retryPolicy := tfresource.GetRetryPolicy(disableFoundRetries, "emwarehouse")
279280
retryPolicy.ShouldRetryOperation = emWarehouseWorkRequestShouldRetryFunc(timeout)
280281

@@ -327,7 +328,7 @@ func emWarehouseWaitForWorkRequest(wId *string, entityType string, action oci_em
327328
return identifier, nil
328329
}
329330

330-
func getErrorFromEmWarehouseEmWarehouseWorkRequest(client *oci_em_warehouse.EmDataLakeClient, workId *string, retryPolicy *oci_common.RetryPolicy, entityType string, action oci_em_warehouse.ActionTypeEnum) error {
331+
func getErrorFromEmWarehouseEmWarehouseWorkRequest(client *oci_em_warehouse.EmWarehouseClient, workId *string, retryPolicy *oci_common.RetryPolicy, entityType string, action oci_em_warehouse.ActionTypeEnum) error {
331332
response, err := client.ListWorkRequestErrors(context.Background(),
332333
oci_em_warehouse.ListWorkRequestErrorsRequest{
333334
WorkRequestId: workId,

‎internal/service/em_warehouse/em_warehouse_em_warehouse_resource_usage_data_source.go‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ func EmWarehouseEmWarehouseResourceUsageDataSource() *schema.Resource {
3636
// Optional
3737

3838
// Computed
39+
"em_discoverer_url": {
40+
Type: schema.TypeString,
41+
Computed: true,
42+
},
3943
"em_host": {
4044
Type: schema.TypeString,
4145
Computed: true,
@@ -55,6 +59,10 @@ func EmWarehouseEmWarehouseResourceUsageDataSource() *schema.Resource {
5559
Type: schema.TypeString,
5660
Computed: true,
5761
},
62+
"schema_name": {
63+
Type: schema.TypeString,
64+
Computed: true,
65+
},
5866
"targets_count": {
5967
Type: schema.TypeInt,
6068
Computed: true,
@@ -66,14 +74,14 @@ func EmWarehouseEmWarehouseResourceUsageDataSource() *schema.Resource {
6674
func readSingularEmWarehouseEmWarehouseResourceUsage(d *schema.ResourceData, m interface{}) error {
6775
sync := &EmWarehouseEmWarehouseResourceUsageDataSourceCrud{}
6876
sync.D = d
69-
sync.Client = m.(*client.OracleClients).EmDataLakeClient()
77+
sync.Client = m.(*client.OracleClients).EmWarehouseClient()
7078

7179
return tfresource.ReadResource(sync)
7280
}
7381

7482
type EmWarehouseEmWarehouseResourceUsageDataSourceCrud struct {
7583
D *schema.ResourceData
76-
Client *oci_em_warehouse.EmDataLakeClient
84+
Client *oci_em_warehouse.EmWarehouseClient
7785
Res *oci_em_warehouse.GetEmWarehouseResourceUsageResponse
7886
}
7987

@@ -121,6 +129,10 @@ func (s *EmWarehouseEmWarehouseResourceUsageDataSourceCrud) SetData() error {
121129
s.D.Set("operations_insights_warehouse_id", *s.Res.OperationsInsightsWarehouseId)
122130
}
123131

132+
if s.Res.SchemaName != nil {
133+
s.D.Set("schema_name", *s.Res.SchemaName)
134+
}
135+
124136
if s.Res.TargetsCount != nil {
125137
s.D.Set("targets_count", *s.Res.TargetsCount)
126138
}
@@ -131,6 +143,10 @@ func (s *EmWarehouseEmWarehouseResourceUsageDataSourceCrud) SetData() error {
131143
func EmInstancesDetailsToMap(obj oci_em_warehouse.EmInstancesDetails) map[string]interface{} {
132144
result := map[string]interface{}{}
133145

146+
if obj.EmDiscovererUrl != nil {
147+
result["em_discoverer_url"] = string(*obj.EmDiscovererUrl)
148+
}
149+
134150
if obj.EmHost != nil {
135151
result["em_host"] = string(*obj.EmHost)
136152
}

‎internal/service/em_warehouse/em_warehouse_em_warehouses_data_source.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ func EmWarehouseEmWarehousesDataSource() *schema.Resource {
5959
func readEmWarehouseEmWarehouses(d *schema.ResourceData, m interface{}) error {
6060
sync := &EmWarehouseEmWarehousesDataSourceCrud{}
6161
sync.D = d
62-
sync.Client = m.(*client.OracleClients).EmDataLakeClient()
62+
sync.Client = m.(*client.OracleClients).EmWarehouseClient()
6363

6464
return tfresource.ReadResource(sync)
6565
}
6666

6767
type EmWarehouseEmWarehousesDataSourceCrud struct {
6868
D *schema.ResourceData
69-
Client *oci_em_warehouse.EmDataLakeClient
69+
Client *oci_em_warehouse.EmWarehouseClient
7070
Res *oci_em_warehouse.ListEmWarehousesResponse
7171
}
7272

‎website/docs/d/em_warehouse_em_warehouse_resource_usage.html.markdown‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,12 @@ The following attributes are exported:
3434

3535
* `em_instance_count` - EmInstanceCount
3636
* `em_instances` - List of emInstances
37+
* `em_discoverer_url` - emdDiscoverer url
3738
* `em_host` - emHost name
3839
* `em_id` - operations Insights Warehouse Identifier
3940
* `targets_count` - EmInstance Target count
4041
* `id` - Unique identifier that is immutable on creation
4142
* `operations_insights_warehouse_id` - operations Insights Warehouse Identifier
43+
* `schema_name` - schema name
4244
* `targets_count` - EmInstance Target count
4345

0 commit comments

Comments
 (0)