Skip to content

Commit c5c910f

Browse files
varmax2511varmax2511
committed
Support for overriding SDK client host url via env variable
1 parent 0816430 commit c5c910f

Some content is hidden

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

47 files changed

+335
-65
lines changed

‎oci/analytics_clients.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func init() {
1313
RegisterOracleClient("oci_analytics.AnalyticsClient", &OracleClient{initClientFn: initAnalyticsAnalyticsClient})
1414
}
1515

16-
func initAnalyticsAnalyticsClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
16+
func initAnalyticsAnalyticsClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
1717
client, err := oci_analytics.NewAnalyticsClientWithConfigurationProvider(configProvider)
1818
if err != nil {
1919
return nil, err
@@ -22,6 +22,10 @@ func initAnalyticsAnalyticsClient(configProvider oci_common.ConfigurationProvide
2222
if err != nil {
2323
return nil, err
2424
}
25+
26+
if serviceClientOverrides.hostUrlOverride != "" {
27+
client.Host = serviceClientOverrides.hostUrlOverride
28+
}
2529
return &client, nil
2630
}
2731

‎oci/apigateway_clients.go‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func init() {
1515
RegisterOracleClient("oci_apigateway.GatewayClient", &OracleClient{initClientFn: initApigatewayGatewayClient})
1616
}
1717

18-
func initApigatewayApiGatewayClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
18+
func initApigatewayApiGatewayClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
1919
client, err := oci_apigateway.NewApiGatewayClientWithConfigurationProvider(configProvider)
2020
if err != nil {
2121
return nil, err
@@ -24,14 +24,18 @@ func initApigatewayApiGatewayClient(configProvider oci_common.ConfigurationProvi
2424
if err != nil {
2525
return nil, err
2626
}
27+
28+
if serviceClientOverrides.hostUrlOverride != "" {
29+
client.Host = serviceClientOverrides.hostUrlOverride
30+
}
2731
return &client, nil
2832
}
2933

3034
func (m *OracleClients) apiGatewayClient() *oci_apigateway.ApiGatewayClient {
3135
return m.GetClient("oci_apigateway.ApiGatewayClient").(*oci_apigateway.ApiGatewayClient)
3236
}
3337

34-
func initApigatewayDeploymentClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
38+
func initApigatewayDeploymentClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
3539
client, err := oci_apigateway.NewDeploymentClientWithConfigurationProvider(configProvider)
3640
if err != nil {
3741
return nil, err
@@ -40,14 +44,18 @@ func initApigatewayDeploymentClient(configProvider oci_common.ConfigurationProvi
4044
if err != nil {
4145
return nil, err
4246
}
47+
48+
if serviceClientOverrides.hostUrlOverride != "" {
49+
client.Host = serviceClientOverrides.hostUrlOverride
50+
}
4351
return &client, nil
4452
}
4553

4654
func (m *OracleClients) deploymentClient() *oci_apigateway.DeploymentClient {
4755
return m.GetClient("oci_apigateway.DeploymentClient").(*oci_apigateway.DeploymentClient)
4856
}
4957

50-
func initApigatewayGatewayClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
58+
func initApigatewayGatewayClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
5159
client, err := oci_apigateway.NewGatewayClientWithConfigurationProvider(configProvider)
5260
if err != nil {
5361
return nil, err
@@ -56,6 +64,10 @@ func initApigatewayGatewayClient(configProvider oci_common.ConfigurationProvider
5664
if err != nil {
5765
return nil, err
5866
}
67+
68+
if serviceClientOverrides.hostUrlOverride != "" {
69+
client.Host = serviceClientOverrides.hostUrlOverride
70+
}
5971
return &client, nil
6072
}
6173

‎oci/audit_clients.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func init() {
1313
RegisterOracleClient("oci_audit.AuditClient", &OracleClient{initClientFn: initAuditAuditClient})
1414
}
1515

16-
func initAuditAuditClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
16+
func initAuditAuditClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
1717
client, err := oci_audit.NewAuditClientWithConfigurationProvider(configProvider)
1818
if err != nil {
1919
return nil, err
@@ -22,6 +22,10 @@ func initAuditAuditClient(configProvider oci_common.ConfigurationProvider, confi
2222
if err != nil {
2323
return nil, err
2424
}
25+
26+
if serviceClientOverrides.hostUrlOverride != "" {
27+
client.Host = serviceClientOverrides.hostUrlOverride
28+
}
2529
return &client, nil
2630
}
2731

‎oci/auto_scaling_clients.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func init() {
1313
RegisterOracleClient("oci_auto_scaling.AutoScalingClient", &OracleClient{initClientFn: initAutoscalingAutoScalingClient})
1414
}
1515

16-
func initAutoscalingAutoScalingClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
16+
func initAutoscalingAutoScalingClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
1717
client, err := oci_auto_scaling.NewAutoScalingClientWithConfigurationProvider(configProvider)
1818
if err != nil {
1919
return nil, err
@@ -22,6 +22,10 @@ func initAutoscalingAutoScalingClient(configProvider oci_common.ConfigurationPro
2222
if err != nil {
2323
return nil, err
2424
}
25+
26+
if serviceClientOverrides.hostUrlOverride != "" {
27+
client.Host = serviceClientOverrides.hostUrlOverride
28+
}
2529
return &client, nil
2630
}
2731

‎oci/bds_clients.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func init() {
1313
RegisterOracleClient("oci_bds.BdsClient", &OracleClient{initClientFn: initBdsBdsClient})
1414
}
1515

16-
func initBdsBdsClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
16+
func initBdsBdsClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
1717
client, err := oci_bds.NewBdsClientWithConfigurationProvider(configProvider)
1818
if err != nil {
1919
return nil, err
@@ -22,6 +22,10 @@ func initBdsBdsClient(configProvider oci_common.ConfigurationProvider, configure
2222
if err != nil {
2323
return nil, err
2424
}
25+
26+
if serviceClientOverrides.hostUrlOverride != "" {
27+
client.Host = serviceClientOverrides.hostUrlOverride
28+
}
2529
return &client, nil
2630
}
2731

‎oci/blockchain_clients.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func init() {
1313
RegisterOracleClient("oci_blockchain.BlockchainPlatformClient", &OracleClient{initClientFn: initBlockchainBlockchainPlatformClient})
1414
}
1515

16-
func initBlockchainBlockchainPlatformClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
16+
func initBlockchainBlockchainPlatformClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
1717
client, err := oci_blockchain.NewBlockchainPlatformClientWithConfigurationProvider(configProvider)
1818
if err != nil {
1919
return nil, err
@@ -22,6 +22,10 @@ func initBlockchainBlockchainPlatformClient(configProvider oci_common.Configurat
2222
if err != nil {
2323
return nil, err
2424
}
25+
26+
if serviceClientOverrides.hostUrlOverride != "" {
27+
client.Host = serviceClientOverrides.hostUrlOverride
28+
}
2529
return &client, nil
2630
}
2731

‎oci/budget_clients.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func init() {
1313
RegisterOracleClient("oci_budget.BudgetClient", &OracleClient{initClientFn: initBudgetBudgetClient})
1414
}
1515

16-
func initBudgetBudgetClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
16+
func initBudgetBudgetClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
1717
client, err := oci_budget.NewBudgetClientWithConfigurationProvider(configProvider)
1818
if err != nil {
1919
return nil, err
@@ -22,6 +22,10 @@ func initBudgetBudgetClient(configProvider oci_common.ConfigurationProvider, con
2222
if err != nil {
2323
return nil, err
2424
}
25+
26+
if serviceClientOverrides.hostUrlOverride != "" {
27+
client.Host = serviceClientOverrides.hostUrlOverride
28+
}
2529
return &client, nil
2630
}
2731

‎oci/cloud_guard_clients.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func init() {
1313
RegisterOracleClient("oci_cloud_guard.CloudGuardClient", &OracleClient{initClientFn: initCloudguardCloudGuardClient})
1414
}
1515

16-
func initCloudguardCloudGuardClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
16+
func initCloudguardCloudGuardClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
1717
client, err := oci_cloud_guard.NewCloudGuardClientWithConfigurationProvider(configProvider)
1818
if err != nil {
1919
return nil, err
@@ -22,6 +22,10 @@ func initCloudguardCloudGuardClient(configProvider oci_common.ConfigurationProvi
2222
if err != nil {
2323
return nil, err
2424
}
25+
26+
if serviceClientOverrides.hostUrlOverride != "" {
27+
client.Host = serviceClientOverrides.hostUrlOverride
28+
}
2529
return &client, nil
2630
}
2731

‎oci/containerengine_clients.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func init() {
1313
RegisterOracleClient("oci_containerengine.ContainerEngineClient", &OracleClient{initClientFn: initContainerengineContainerEngineClient})
1414
}
1515

16-
func initContainerengineContainerEngineClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
16+
func initContainerengineContainerEngineClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
1717
client, err := oci_containerengine.NewContainerEngineClientWithConfigurationProvider(configProvider)
1818
if err != nil {
1919
return nil, err
@@ -22,6 +22,10 @@ func initContainerengineContainerEngineClient(configProvider oci_common.Configur
2222
if err != nil {
2323
return nil, err
2424
}
25+
26+
if serviceClientOverrides.hostUrlOverride != "" {
27+
client.Host = serviceClientOverrides.hostUrlOverride
28+
}
2529
return &client, nil
2630
}
2731

‎oci/core_clients.go‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func init() {
1616
RegisterOracleClient("oci_core.VirtualNetworkClient", &OracleClient{initClientFn: initCoreVirtualNetworkClient})
1717
}
1818

19-
func initCoreBlockstorageClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
19+
func initCoreBlockstorageClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
2020
client, err := oci_core.NewBlockstorageClientWithConfigurationProvider(configProvider)
2121
if err != nil {
2222
return nil, err
@@ -25,14 +25,18 @@ func initCoreBlockstorageClient(configProvider oci_common.ConfigurationProvider,
2525
if err != nil {
2626
return nil, err
2727
}
28+
29+
if serviceClientOverrides.hostUrlOverride != "" {
30+
client.Host = serviceClientOverrides.hostUrlOverride
31+
}
2832
return &client, nil
2933
}
3034

3135
func (m *OracleClients) blockstorageClient() *oci_core.BlockstorageClient {
3236
return m.GetClient("oci_core.BlockstorageClient").(*oci_core.BlockstorageClient)
3337
}
3438

35-
func initCoreComputeClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
39+
func initCoreComputeClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
3640
client, err := oci_core.NewComputeClientWithConfigurationProvider(configProvider)
3741
if err != nil {
3842
return nil, err
@@ -41,14 +45,18 @@ func initCoreComputeClient(configProvider oci_common.ConfigurationProvider, conf
4145
if err != nil {
4246
return nil, err
4347
}
48+
49+
if serviceClientOverrides.hostUrlOverride != "" {
50+
client.Host = serviceClientOverrides.hostUrlOverride
51+
}
4452
return &client, nil
4553
}
4654

4755
func (m *OracleClients) computeClient() *oci_core.ComputeClient {
4856
return m.GetClient("oci_core.ComputeClient").(*oci_core.ComputeClient)
4957
}
5058

51-
func initCoreComputeManagementClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
59+
func initCoreComputeManagementClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
5260
client, err := oci_core.NewComputeManagementClientWithConfigurationProvider(configProvider)
5361
if err != nil {
5462
return nil, err
@@ -57,14 +65,18 @@ func initCoreComputeManagementClient(configProvider oci_common.ConfigurationProv
5765
if err != nil {
5866
return nil, err
5967
}
68+
69+
if serviceClientOverrides.hostUrlOverride != "" {
70+
client.Host = serviceClientOverrides.hostUrlOverride
71+
}
6072
return &client, nil
6173
}
6274

6375
func (m *OracleClients) computeManagementClient() *oci_core.ComputeManagementClient {
6476
return m.GetClient("oci_core.ComputeManagementClient").(*oci_core.ComputeManagementClient)
6577
}
6678

67-
func initCoreVirtualNetworkClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
79+
func initCoreVirtualNetworkClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
6880
client, err := oci_core.NewVirtualNetworkClientWithConfigurationProvider(configProvider)
6981
if err != nil {
7082
return nil, err
@@ -73,6 +85,10 @@ func initCoreVirtualNetworkClient(configProvider oci_common.ConfigurationProvide
7385
if err != nil {
7486
return nil, err
7587
}
88+
89+
if serviceClientOverrides.hostUrlOverride != "" {
90+
client.Host = serviceClientOverrides.hostUrlOverride
91+
}
7692
return &client, nil
7793
}
7894

0 commit comments

Comments
 (0)