Do not generate deprecated attribute

3 files changed, 20 insertions, 21 deletions

diff --git a/client/go/cmd/prod_test.go b/client/go/cmd/prod_test.go
index a4f3ebd6b56..4e635f87a75 100644
--- a/client/go/cmd/prod_test.go
+++ b/client/go/cmd/prod_test.go
@@ -46,8 +46,8 @@ func TestProdInit(t *testing.T) {
 	// Verify contents
 	deploymentPath := filepath.Join(pkgDir, "src", "main", "application", "deployment.xml")
 	deploymentXML := readFileString(t, deploymentPath)
-	assert.Contains(t, deploymentXML, `<region active="true">aws-us-west-2a</region>`)
-	assert.Contains(t, deploymentXML, `<region active="true">aws-eu-west-1a</region>`)
+	assert.Contains(t, deploymentXML, `<region>aws-us-west-2a</region>`)
+	assert.Contains(t, deploymentXML, `<region>aws-eu-west-1a</region>`)
 
 	servicesPath := filepath.Join(pkgDir, "src", "main", "application", "services.xml")
 	servicesXML := readFileString(t, servicesPath)
@@ -90,7 +90,7 @@ func createApplication(t *testing.T, pkgDir string, java bool) {
 
 	deploymentXML := `<deployment version="1.0">
   <prod>
-    <region active="true">aws-us-east-1c</region>
+    <region>aws-us-east-1c</region>
   </prod>
 </deployment>`
 	if err := ioutil.WriteFile(filepath.Join(appDir, "deployment.xml"), []byte(deploymentXML), 0644); err != nil {
diff --git a/client/go/vespa/xml/config.go b/client/go/vespa/xml/config.go
index a7ff37875ae..3243764fd3e 100644
--- a/client/go/vespa/xml/config.go
+++ b/client/go/vespa/xml/config.go
@@ -16,7 +16,7 @@ var DefaultDeployment Deployment
 func init() {
 	defaultDeploymentRaw := `<deployment version="1.0">
   <prod>
-    <region active="true">aws-us-east-1c</region>
+    <region>aws-us-east-1c</region>
   </prod>
 </deployment>`
 	d, err := ReadDeployment(strings.NewReader(defaultDeploymentRaw))
@@ -44,8 +44,7 @@ type Prod struct {
 }
 
 type Region struct {
-	Name   string `xml:",chardata"`
-	Active bool   `xml:"active,attr"`
+	Name string `xml:",chardata"`
 }
 
 func (d Deployment) String() string { return d.rawXML.String() }
@@ -142,7 +141,7 @@ func ReadServices(r io.Reader) (Services, error) {
 func Regions(names ...string) []Region {
 	var regions []Region
 	for _, z := range names {
-		regions = append(regions, Region{Name: z, Active: true})
+		regions = append(regions, Region{Name: z})
 	}
 	return regions
 }
diff --git a/client/go/vespa/xml/config_test.go b/client/go/vespa/xml/config_test.go
index 385653ab83f..299bfd372f7 100644
--- a/client/go/vespa/xml/config_test.go
+++ b/client/go/vespa/xml/config_test.go
@@ -10,15 +10,15 @@ func TestReplaceDeployment(t *testing.T) {
 	in := `
 <deployment version="1.0">
     <prod>
-        <region active="true">us-north-1</region>
-        <region active="false">eu-north-2</region>
+        <region>us-north-1</region>
+        <region>eu-north-2</region>
     </prod>
 </deployment>`
 
 	out := `<deployment version="1.0">
   <prod>
-    <region active="true">eu-south-1</region>
-    <region active="true">us-central-1</region>
+    <region>eu-south-1</region>
+    <region>us-central-1</region>
   </prod>
 </deployment>
 `
@@ -31,12 +31,12 @@ func TestReplaceDeploymentWithInstance(t *testing.T) {
 <deployment version="1.0">
     <instance id="default">
         <prod>
-            <region active="true">us-north-1</region>
+            <region>us-north-1</region>
         </prod>
     </instance>
     <instance id="beta">
         <prod>
-            <region active="true">eu-south-1</region>
+            <region>eu-south-1</region>
         </prod>
     </instance>
 </deployment>`
@@ -44,14 +44,14 @@ func TestReplaceDeploymentWithInstance(t *testing.T) {
 	out := `<deployment version="1.0">
   <instance id="default">
     <prod>
-      <region active="true">us-central-1</region>
-      <region active="true">eu-west-1</region>
+      <region>us-central-1</region>
+      <region>eu-west-1</region>
     </prod>
   </instance>
   <instance id="beta">
     <prod>
-      <region active="true">us-central-1</region>
-      <region active="true">eu-west-1</region>
+      <region>us-central-1</region>
+      <region>eu-west-1</region>
     </prod>
   </instance>
 </deployment>
@@ -132,16 +132,16 @@ func TestReplaceRemovesElement(t *testing.T) {
 	in := `
 <deployment version="1.0">
     <prod>
-        <region active="true">eu-south-1</region>
-        <region active="true">us-central-1</region>
+        <region>eu-south-1</region>
+        <region>us-central-1</region>
         <test>us-central-1</test>
     </prod>
 </deployment>`
 
 	out := `<deployment version="1.0">
   <prod>
-    <region active="true">eu-south-1</region>
-    <region active="true">us-central-1</region>
+    <region>eu-south-1</region>
+    <region>us-central-1</region>
   </prod>
 </deployment>
 `