Merge branch 'main' into gpu

common/roles.go

@@ -33,6 +33,8 @@ const (
 	LBContributorRoleName = "LBContributor"
 	// Network Interface Contributor Role - has permissions to run any operation on network interfaces
 	NIContributorRoleName = "NetworkInterfaceContributor"
+	// Network Security Group Contributor Role - has permissions to run any operation on network security groups
+	NSGContributorRoleName = "NetworkSecurityGroupContributor"
 	// VM Contributor Role - has permissions to run any operation on VMs
 	VMContributorRoleName = "VMContributor"
 	// VM Updater Role - has permissions to update VMs
@@ -91,6 +93,8 @@ const (
 	LBReaderRoleName = "LBReader"
 	// Network Interface Reader Role - has permissions to run read operations on network interfaces
 	NIReaderRoleName = "NetworkInterfaceReader"
+	// Network Security Group Reader Role - has permissions to run read operations on network security groups
+	NSGReaderRoleName = "NetworkSecurityGroupReader"
 	// VM Reader Role - has permissions to run read operations on VMs
 	VMReaderRoleName = "VMReader"
 	// VirtualMachineImage Reader Role - has permissions to run read operations on VirtualMachineImages

pkg/validations/proxy_validation_test.go

@@ -39,6 +39,7 @@ func Test_TestProxyUrlConnection(t *testing.T) {
 	// Invalid hostname
 	err = TestProxyUrlConnection(parsedUrl, caCertString, "")
 	expectedResult := "Get \"https://mcr.microsoft.com\": proxyconnect tcp: dial tcp: lookup w3proxy.netscape.com: no such host: Invalid Input"
+
 	if err.Error() != expectedResult {
 		t.Fatalf("Test_TestProxyUrlConnection test case failed. Expected error %s but got %s", expectedResult, err.Error())
 	}