From ab626312c6f17828a7514cab8f2364adce7d46c9 Mon Sep 17 00:00:00 2001 From: Nathan Coleman Date: Fri, 8 Sep 2023 15:51:14 -0400 Subject: [PATCH 1/2] Generate deep-copy code --- agent/consul/state/catalog_schema.deepcopy.go | 3 -- agent/structs/structs.deepcopy.go | 44 +++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/agent/consul/state/catalog_schema.deepcopy.go b/agent/consul/state/catalog_schema.deepcopy.go index af4d430d2f97..406a7fdce796 100644 --- a/agent/consul/state/catalog_schema.deepcopy.go +++ b/agent/consul/state/catalog_schema.deepcopy.go @@ -1,6 +1,3 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: BUSL-1.1 - // generated by deep-copy -pointer-receiver -o ./catalog_schema.deepcopy.go -type upstreamDownstream ./; DO NOT EDIT. package state diff --git a/agent/structs/structs.deepcopy.go b/agent/structs/structs.deepcopy.go index 0434ba1e67da..8a2b95f2964a 100644 --- a/agent/structs/structs.deepcopy.go +++ b/agent/structs/structs.deepcopy.go @@ -424,6 +424,28 @@ func (o *HTTPRouteConfigEntry) DeepCopy() *HTTPRouteConfigEntry { if o.Rules[i2].Filters.JWT != nil { cp.Rules[i2].Filters.JWT = o.Rules[i2].Filters.JWT.DeepCopy() } + if o.Rules[i2].ResponseFilters.Headers != nil { + cp.Rules[i2].ResponseFilters.Headers = make([]HTTPHeaderFilter, len(o.Rules[i2].ResponseFilters.Headers)) + copy(cp.Rules[i2].ResponseFilters.Headers, o.Rules[i2].ResponseFilters.Headers) + for i5 := range o.Rules[i2].ResponseFilters.Headers { + if o.Rules[i2].ResponseFilters.Headers[i5].Add != nil { + cp.Rules[i2].ResponseFilters.Headers[i5].Add = make(map[string]string, len(o.Rules[i2].ResponseFilters.Headers[i5].Add)) + for k7, v7 := range o.Rules[i2].ResponseFilters.Headers[i5].Add { + cp.Rules[i2].ResponseFilters.Headers[i5].Add[k7] = v7 + } + } + if o.Rules[i2].ResponseFilters.Headers[i5].Remove != nil { + cp.Rules[i2].ResponseFilters.Headers[i5].Remove = make([]string, len(o.Rules[i2].ResponseFilters.Headers[i5].Remove)) + copy(cp.Rules[i2].ResponseFilters.Headers[i5].Remove, o.Rules[i2].ResponseFilters.Headers[i5].Remove) + } + if o.Rules[i2].ResponseFilters.Headers[i5].Set != nil { + cp.Rules[i2].ResponseFilters.Headers[i5].Set = make(map[string]string, len(o.Rules[i2].ResponseFilters.Headers[i5].Set)) + for k7, v7 := range o.Rules[i2].ResponseFilters.Headers[i5].Set { + cp.Rules[i2].ResponseFilters.Headers[i5].Set[k7] = v7 + } + } + } + } if o.Rules[i2].Matches != nil { cp.Rules[i2].Matches = make([]HTTPMatch, len(o.Rules[i2].Matches)) copy(cp.Rules[i2].Matches, o.Rules[i2].Matches) @@ -495,6 +517,28 @@ func (o *HTTPRouteConfigEntry) DeepCopy() *HTTPRouteConfigEntry { if o.Rules[i2].Services[i4].Filters.JWT != nil { cp.Rules[i2].Services[i4].Filters.JWT = o.Rules[i2].Services[i4].Filters.JWT.DeepCopy() } + if o.Rules[i2].Services[i4].ResponseFilters.Headers != nil { + cp.Rules[i2].Services[i4].ResponseFilters.Headers = make([]HTTPHeaderFilter, len(o.Rules[i2].Services[i4].ResponseFilters.Headers)) + copy(cp.Rules[i2].Services[i4].ResponseFilters.Headers, o.Rules[i2].Services[i4].ResponseFilters.Headers) + for i7 := range o.Rules[i2].Services[i4].ResponseFilters.Headers { + if o.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Add != nil { + cp.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Add = make(map[string]string, len(o.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Add)) + for k9, v9 := range o.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Add { + cp.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Add[k9] = v9 + } + } + if o.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Remove != nil { + cp.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Remove = make([]string, len(o.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Remove)) + copy(cp.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Remove, o.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Remove) + } + if o.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Set != nil { + cp.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Set = make(map[string]string, len(o.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Set)) + for k9, v9 := range o.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Set { + cp.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Set[k9] = v9 + } + } + } + } } } } From 4a3f3d1bb85568a4acdb72e56c0e73fc22fe8f7e Mon Sep 17 00:00:00 2001 From: Nathan Coleman Date: Fri, 8 Sep 2023 15:56:19 -0400 Subject: [PATCH 2/2] Undo license header removal --- agent/consul/state/catalog_schema.deepcopy.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/agent/consul/state/catalog_schema.deepcopy.go b/agent/consul/state/catalog_schema.deepcopy.go index 406a7fdce796..af4d430d2f97 100644 --- a/agent/consul/state/catalog_schema.deepcopy.go +++ b/agent/consul/state/catalog_schema.deepcopy.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + // generated by deep-copy -pointer-receiver -o ./catalog_schema.deepcopy.go -type upstreamDownstream ./; DO NOT EDIT. package state