oem/azure: normalize endpoint prefixes

crawford · crawford · commit c6ff07a29fe7 · 2016-06-11T09:25:58.000-07:00
Some regions lead with a '.' and others do not...
diff --git a/oem/azure/common.sh b/oem/azure/common.sh
@@ -9,12 +9,13 @@ getManagementEndpoint() {
 }
 
 getStorageEndpointPrefix() {
-	azure account env show --environment=$(getAzureEnvironment) --json | \
-		jq '.storageEndpointSuffix' --raw-output
+	prefix=$(azure account env show --environment=$(getAzureEnvironment) --json | \
+		jq '.storageEndpointSuffix' --raw-output)
+	echo "${prefix##.}"
 }
 
 getBlobStorageEndpoint() {
-	echo "blob$(getStorageEndpointPrefix)"
+	echo "blob.$(getStorageEndpointPrefix)"
 }
 
 getSubscriptionId() {

Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,13 @@ getManagementEndpoint() {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`getStorageEndpointPrefix() {`
`12`		`- azure account env show --environment=$(getAzureEnvironment) --json \| \`
`13`		`- jq '.storageEndpointSuffix' --raw-output`
	`12`	`+ prefix=$(azure account env show --environment=$(getAzureEnvironment) --json \| \`
	`13`	`+ jq '.storageEndpointSuffix' --raw-output)`
	`14`	`+ echo "${prefix##.}"`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`getBlobStorageEndpoint() {`
`17`		`- echo "blob$(getStorageEndpointPrefix)"`
	`18`	`+ echo "blob.$(getStorageEndpointPrefix)"`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`getSubscriptionId() {`