Merge pull request #21 from Azure/pr-fix-logic-is-internal

fix logic for IsExtensionInternal
Azure · Sep 12, 2017 · 0d6edb2 · 0d6edb2
2 parents 8045f1b + db4213b
commit 0d6edb2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/manifest.go b/manifest.go
@@ -109,12 +109,7 @@ func newExtensionImageManifest(filename string, regions []string) (extensionMani
 	}
 
 	manifest.Regions = strings.Join(regions, ";")
-
-	if !isGuestAgent(manifest.ProviderNameSpace) {
-		manifest.IsInternalExtension = false
-	} else {
-		log.Debug("VM agent namespace detected, IsInternalExtension ignored")
-	}
+	manifest.IsInternalExtension = isGuestAgent(manifest.ProviderNameSpace)
 
 	return &manifest, nil
 }
@@ -131,7 +126,7 @@ func newExtensionImageGlobalManifest(filename string) (extensionManifest, error)
 		return nil, err
 	}
 
-	manifest.IsInternalExtension = !isGuestAgent(manifest.ProviderNameSpace)
+	manifest.IsInternalExtension = isGuestAgent(manifest.ProviderNameSpace)
 	return &manifest, nil
 }
 

diff --git a/manifest_test.go b/manifest_test.go
@@ -174,3 +174,13 @@ func TestRoundTripXmlExtensionImageGlobal(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+func TestIsGuestAgent(t *testing.T) {
+	if !isGuestAgent("Microsoft.OSTCLinuxAgent") {
+		t.Error("true if namespace == \"Microsoft.OSTCAgentLinux\"")
+	}
+
+	if isGuestAgent("Is.Fake.Namespace") {
+		t.Error("true if namespace != \"Microsoft.OSTCAgentLinux\"")
+	}
+}