Merge pull request #22812 from magodo/network_custom_ip_prefix_client…

…_init `azurerm_custom_ip_prefix` - Honors customized resource manager endpoint
hashicorp · Aug 4, 2023 · ce775a7 · ce775a7
2 parents 1ea562c + 9d2a983
commit ce775a7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/internal/services/network/client/client.go b/internal/services/network/client/client.go
@@ -73,7 +73,7 @@ func NewClient(o *common.ClientOptions) (*Client, error) {
 	configurationPolicyGroupClient := network.NewConfigurationPolicyGroupsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&configurationPolicyGroupClient.Client, o.ResourceManagerAuthorizer)
 
-	customIpPrefixesClient := network.NewCustomIPPrefixesClient(o.SubscriptionId)
+	customIpPrefixesClient := network.NewCustomIPPrefixesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&customIpPrefixesClient.Client, o.ResourceManagerAuthorizer)
 
 	DDOSProtectionPlansClient := network.NewDdosProtectionPlansClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)

diff --git a/scripts/run-gradually-deprecated.sh b/scripts/run-gradually-deprecated.sh
@@ -103,6 +103,14 @@ function runGraduallyDeprecatedFunctions {
             exit 1
           fi
         fi
+
+        # require Azure SDK clients are created with the resource manager endpoint specified
+        grep -H -n "Client(o.SubscriptionId)" "$f" && {
+            echo "The Azure SDK (track1 & kermit) clients should be created with the function NewFoosClientWithBaseURI() "
+            echo "that has the resource manager endpoint explicitly specified. These can be found in:"
+            echo "* $f"
+            exit 1
+        }
     fi
 
   done