From d2f09ca30634e6fa6a6a2a782bd35162d2fc5736 Mon Sep 17 00:00:00 2001
From: "R.B. Boyer" <rb@hashicorp.com>
Date: Fri, 9 Oct 2020 09:42:53 -0500
Subject: [PATCH] upstream some differences from enterprise (#8902)

---
 agent/consul/state/catalog_events_test.go     | 4 ++++
 agent/consul/state/{delay.go => delay_oss.go} | 0
 api/namespace.go                              | 6 +++---
 build-support/scripts/proto-gen.sh            | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)
 rename agent/consul/state/{delay.go => delay_oss.go} (100%)

diff --git a/agent/consul/state/catalog_events_test.go b/agent/consul/state/catalog_events_test.go
index 9d6d91d54..95d13c0df 100644
--- a/agent/consul/state/catalog_events_test.go
+++ b/agent/consul/state/catalog_events_test.go
@@ -1420,6 +1420,7 @@ func newTestEventServiceHealthRegister(index uint64, nodeNum int, svc string) st
 						CreateIndex: index,
 						ModifyIndex: index,
 					},
+					EnterpriseMeta: *structs.DefaultEnterpriseMeta(),
 				},
 				Checks: []*structs.HealthCheck{
 					{
@@ -1431,6 +1432,7 @@ func newTestEventServiceHealthRegister(index uint64, nodeNum int, svc string) st
 							CreateIndex: index,
 							ModifyIndex: index,
 						},
+						EnterpriseMeta: *structs.DefaultEnterpriseMeta(),
 					},
 					{
 						Node:        node,
@@ -1444,6 +1446,7 @@ func newTestEventServiceHealthRegister(index uint64, nodeNum int, svc string) st
 							CreateIndex: index,
 							ModifyIndex: index,
 						},
+						EnterpriseMeta: *structs.DefaultEnterpriseMeta(),
 					},
 				},
 			},
@@ -1486,6 +1489,7 @@ func newTestEventServiceHealthDeregister(index uint64, nodeNum int, svc string)
 						CreateIndex: 10,
 						ModifyIndex: 10,
 					},
+					EnterpriseMeta: *structs.DefaultEnterpriseMeta(),
 				},
 			},
 		},
diff --git a/agent/consul/state/delay.go b/agent/consul/state/delay_oss.go
similarity index 100%
rename from agent/consul/state/delay.go
rename to agent/consul/state/delay_oss.go
diff --git a/api/namespace.go b/api/namespace.go
index 875af105f..49782d2a8 100644
--- a/api/namespace.go
+++ b/api/namespace.go
@@ -26,7 +26,7 @@ type Namespace struct {
 
 	// DeletedAt is the time when the Namespace was marked for deletion
 	// This is nullable so that we can omit if empty when encoding in JSON
-	DeletedAt *time.Time `json:"DeletedAt,omitempty"`
+	DeletedAt *time.Time `json:"DeletedAt,omitempty" alias:"deleted_at"`
 
 	// CreateIndex is the Raft index at which the Namespace was created
 	CreateIndex uint64 `json:"CreateIndex,omitempty"`
@@ -39,10 +39,10 @@ type Namespace struct {
 type NamespaceACLConfig struct {
 	// PolicyDefaults is the list of policies that should be used for the parent authorizer
 	// of all tokens in the associated namespace.
-	PolicyDefaults []ACLLink `json:"PolicyDefaults"`
+	PolicyDefaults []ACLLink `json:"PolicyDefaults" alias:"policy_defaults"`
 	// RoleDefaults is the list of roles that should be used for the parent authorizer
 	// of all tokens in the associated namespace.
-	RoleDefaults []ACLLink `json:"RoleDefaults"`
+	RoleDefaults []ACLLink `json:"RoleDefaults" alias:"role_defaults"`
 }
 
 // Namespaces can be used to manage Namespaces in Consul Enterprise..
diff --git a/build-support/scripts/proto-gen.sh b/build-support/scripts/proto-gen.sh
index e98e76c12..e79235aa9 100755
--- a/build-support/scripts/proto-gen.sh
+++ b/build-support/scripts/proto-gen.sh
@@ -76,6 +76,7 @@ function main {
    gogo_proto_imp_replace="${gogo_proto_imp_replace},Mgoogle/protobuf/struct.proto=github.com/gogo/protobuf/types"
    gogo_proto_imp_replace="${gogo_proto_imp_replace},Mgoogle/api/annotations.proto=github.com/gogo/googleapis/google/api"
    gogo_proto_imp_replace="${gogo_proto_imp_replace},Mgoogle/protobuf/field_mask.proto=github.com/gogo/protobuf/types"
+   gogo_proto_imp_replace="${gogo_proto_imp_replace},Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types"
 
    local proto_go_path=${proto_path%%.proto}.pb.go
    local proto_go_bin_path=${proto_path%%.proto}.pb.binary.go