Update Go template with new service names

Nicholas Thomson · Nicholas Thomson · commit 4adeb2803274 · 2021-10-04T12:45:42.000-07:00
diff --git a/pkg/model/model.go b/pkg/model/model.go
@@ -51,6 +51,7 @@ type Model struct {
 // service API
 func (m *Model) MetaVars() templateset.MetaVars {
 	return templateset.MetaVars{
+		ServiceAlias:            m.serviceAlias,
 		ServiceAliasClean:       m.ServiceAliasClean(),
 		ServiceModelName:        m.serviceModelName,
 		APIGroup:                m.APIGroup(),
diff --git a/templates/cmd/controller/main.go.tpl b/templates/cmd/controller/main.go.tpl
@@ -14,19 +14,19 @@ import (
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	ctrlrt "sigs.k8s.io/controller-runtime"
 	ctrlrtmetrics "sigs.k8s.io/controller-runtime/pkg/metrics"
-	svcsdk "github.com/aws/aws-sdk-go/service/{{ .ServiceIDClean }}"
+	svcsdk "github.com/aws/aws-sdk-go/service/{{ .ServiceAlias }}"
 
 	ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1"
-	svcresource "github.com/aws-controllers-k8s/{{ .ServiceIDClean }}-controller/pkg/resource"
-	svctypes "github.com/aws-controllers-k8s/{{ .ServiceIDClean }}-controller/apis/{{ .APIVersion }}"
+	svcresource "github.com/aws-controllers-k8s/{{ .ServiceAlias }}-controller/pkg/resource"
+	svctypes "github.com/aws-controllers-k8s/{{ .ServiceAlias }}-controller/apis/{{ .APIVersion }}"
 	{{/* TODO(a-hilaly): import apis/* packages to register webhooks */}}
-	{{ $serviceIDClean := .ServiceIDClean }} {{range $crdName := .SnakeCasedCRDNames }}_ "github.com/aws-controllers-k8s/{{ $serviceIDClean }}-controller/pkg/resource/{{ $crdName }}"
+	{{ $serviceAlias := .ServiceAlias }} {{range $crdName := .SnakeCasedCRDNames }}_ "github.com/aws-controllers-k8s/{{ $serviceAlias }}-controller/pkg/resource/{{ $crdName }}"
 	{{end}}
 )
 
 var (
 	awsServiceAPIGroup = "{{ .APIGroup }}"
-	awsServiceAlias	= "{{ .ServiceIDClean }}"
+	awsServiceAlias	= "{{ .ServiceAlias }}"
 	awsServiceEndpointsID = svcsdk.EndpointsID
 	scheme			 = runtime.NewScheme()
 	setupLog		   = ctrlrt.Log.WithName("setup")
diff --git a/templates/config/controller/deployment.yaml.tpl b/templates/config/controller/deployment.yaml.tpl
@@ -8,7 +8,7 @@ metadata:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: ack-{{ .ServiceIDClean }}-controller
+  name: ack-{{ .ServiceAlias }}-controller
   namespace: ack-system
   labels:
     control-plane: controller
diff --git a/templates/config/controller/kustomization_def.yaml.tpl b/templates/config/controller/kustomization_def.yaml.tpl
@@ -6,6 +6,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: ack-{{ .ServiceIDClean }}-controller
+  newName: ack-{{ .ServiceAlias }}-controller
   newTag: latest
 {{end}}
diff --git a/templates/config/controller/service.yaml.tpl b/templates/config/controller/service.yaml.tpl
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: ack-{{ .ServiceIDClean }}-metrics-service
+  name: ack-{{ .ServiceAlias }}-metrics-service
   namespace: ack-system
 spec:
   selector:
diff --git a/templates/config/controller/user-env.yaml.tpl b/templates/config/controller/user-env.yaml.tpl
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: ack-{{.ServiceIDClean}}-controller
+  name: ack-{{.ServiceAlias}}-controller
   namespace: {{.Annotations.SuggestedNamespace}}
 spec:
   template:
diff --git a/templates/config/manifests/bases/clusterserviceversion.yaml.tpl b/templates/config/manifests/bases/clusterserviceversion.yaml.tpl
@@ -7,12 +7,12 @@ metadata:
     capabilities: {{.Annotations.CapabilityLevel}}
     operatorframework.io/suggested-namespace: "ack-system"
     repository: {{.Annotations.Repository}}
-    containerImage: {{.Annotations.ContainerImage}}/{{.ServiceIDClean}}-controller:v{{.Version}}
+    containerImage: {{.Annotations.ContainerImage}}/{{.ServiceAlias}}-controller:v{{.Version}}
     description: {{.Annotations.ShortDescription}}
     createdAt: {{.CreatedAt}}
     support: {{.Annotations.Support}}
     certified: {{.Annotations.IsCertified}}
-  name: ack-{{.ServiceIDClean }}-controller.v0.0.0
+  name: ack-{{.ServiceAlias }}-controller.v0.0.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -42,7 +42,7 @@ spec:
     type: {{ .Type }}
   {{- end}}
   keywords:
-  - {{.ServiceIDClean}}
+  - {{.ServiceAlias}}
   {{- range .Common.Keywords}}
   - {{ . }}
   {{- end}}
diff --git a/templates/config/overlays/namespaced/kustomization.yaml.tpl b/templates/config/overlays/namespaced/kustomization.yaml.tpl
@@ -6,10 +6,10 @@ patches:
     group: rbac.authorization.k8s.io
     version: v1
     kind: ClusterRole
-    name: ack-{{ .ServiceIDClean }}-controller
+    name: ack-{{ .ServiceAlias }}-controller
 - path: role-binding.json
   target:
     group: rbac.authorization.k8s.io
     version: v1
     kind: ClusterRoleBinding
-    name: ack-{{ .ServiceIDClean }}-controller-rolebinding
+    name: ack-{{ .ServiceAlias }}-controller-rolebinding
diff --git a/templates/config/rbac/cluster-role-binding.yaml.tpl b/templates/config/rbac/cluster-role-binding.yaml.tpl
@@ -1,11 +1,11 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: ack-{{ .ServiceIDClean }}-controller-rolebinding
+  name: ack-{{ .ServiceAlias }}-controller-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: ack-{{ .ServiceIDClean }}-controller
+  name: ack-{{ .ServiceAlias }}-controller
 subjects:
 - kind: ServiceAccount
   name: default
diff --git a/templates/config/rbac/role-reader.yaml.tpl b/templates/config/rbac/role-reader.yaml.tpl
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   creationTimestamp: null
-  name: ack-{{ .ServiceIDClean }}-reader
+  name: ack-{{ .ServiceAlias }}-reader
   namespace: default
 rules:
 - apiGroups:
diff --git a/templates/config/rbac/role-writer.yaml.tpl b/templates/config/rbac/role-writer.yaml.tpl
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   creationTimestamp: null
-  name: ack-{{ .ServiceIDClean }}-writer
+  name: ack-{{ .ServiceAlias }}-writer
   namespace: default
 rules:
 - apiGroups:
diff --git a/templates/crossplane/pkg/controller.go.tpl b/templates/crossplane/pkg/controller.go.tpl
@@ -11,16 +11,16 @@ import (
 	"github.com/google/go-cmp/cmp"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	svcsdkapi "github.com/aws/aws-sdk-go/service/{{ .ServiceIDClean }}/{{ .ServiceIDClean }}iface"
-	svcapi "github.com/aws/aws-sdk-go/service/{{ .ServiceIDClean }}"
-	svcsdk "github.com/aws/aws-sdk-go/service/{{ .ServiceIDClean }}"
+	svcsdkapi "github.com/aws/aws-sdk-go/service/{{ .ServiceAlias }}/{{ .ServiceAlias }}iface"
+	svcapi "github.com/aws/aws-sdk-go/service/{{ .ServiceAlias }}"
+	svcsdk "github.com/aws/aws-sdk-go/service/{{ .ServiceAlias }}"
 
 	"github.com/crossplane/crossplane-runtime/pkg/meta"
 	"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
 	cpresource "github.com/crossplane/crossplane-runtime/pkg/resource"
 	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
 
-	svcapitypes "github.com/crossplane/provider-aws/apis/{{ .ServiceIDClean }}/{{ .APIVersion}}"
+	svcapitypes "github.com/crossplane/provider-aws/apis/{{ .ServiceAlias }}/{{ .APIVersion}}"
 	awsclient "github.com/crossplane/provider-aws/pkg/clients"
 )
 
diff --git a/templates/crossplane/pkg/conversions.go.tpl b/templates/crossplane/pkg/conversions.go.tpl
@@ -11,9 +11,9 @@ import (
 {{ end }}
 {{- end }}
 	"github.com/aws/aws-sdk-go/aws/awserr"
-	svcsdk "github.com/aws/aws-sdk-go/service/{{ .ServiceIDClean }}"
+	svcsdk "github.com/aws/aws-sdk-go/service/{{ .ServiceAlias }}"
 
-	svcapitypes "github.com/crossplane/provider-aws/apis/{{ .ServiceIDClean }}/{{ .APIVersion}}"
+	svcapitypes "github.com/crossplane/provider-aws/apis/{{ .ServiceAlias }}/{{ .APIVersion}}"
 )
 
 // NOTE(muvaf): We return pointers in case the function needs to start with an
diff --git a/templates/helm/Chart.yaml.tpl b/templates/helm/Chart.yaml.tpl
@@ -1,18 +1,18 @@
 apiVersion: v1
-name: {{ .ServiceIDClean }}-chart
+name: {{ .ServiceAlias }}-chart
 description: A Helm chart for the ACK service controller for {{ .Metadata.Service.FullName }} ({{ .Metadata.Service.ShortName }})
 version: {{ .ReleaseVersion }}
 appVersion: {{ .ReleaseVersion }}
-home: https://github.com/aws-controllers-k8s/{{ .ServiceIDClean }}-controller
+home: https://github.com/aws-controllers-k8s/{{ .ServiceAlias }}-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:
-  - https://github.com/aws-controllers-k8s/{{ .ServiceIDClean }}-controller
+  - https://github.com/aws-controllers-k8s/{{ .ServiceAlias }}-controller
 maintainers:
   - name: ACK Admins
     url: https://github.com/orgs/aws-controllers-k8s/teams/ack-admin
   - name: {{ .Metadata.Service.ShortName }} Admins
-    url: https://github.com/orgs/aws-controllers-k8s/teams/{{ .ServiceIDClean }}-maintainer
+    url: https://github.com/orgs/aws-controllers-k8s/teams/{{ .ServiceAlias }}-maintainer
 keywords:
   - aws
   - kubernetes
-  - {{ .ServiceIDClean }}
+  - {{ .ServiceAlias }}
diff --git a/templates/helm/templates/_controller-role-kind-patch.yaml.tpl b/templates/helm/templates/_controller-role-kind-patch.yaml.tpl
@@ -3,11 +3,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
-  name: ack-{{ .ServiceIDClean }}-controller
+  name: ack-{{ .ServiceAlias }}-controller
 {{ "{{ else }}" }}
 kind: Role
 metadata:
   creationTimestamp: null
-  name: ack-{{ .ServiceIDClean }}-controller
+  name: ack-{{ .ServiceAlias }}-controller
   namespace: {{ "{{ .Release.Namespace }}" }}
 {{ "{{ end }}" }}
diff --git a/templates/helm/templates/cluster-role-binding.yaml.tpl b/templates/helm/templates/cluster-role-binding.yaml.tpl
@@ -14,7 +14,7 @@ roleRef:
   kind: Role
 {{ "{{ end }}" }}
   apiGroup: rbac.authorization.k8s.io
-  name: ack-{{ .ServiceIDClean }}-controller
+  name: ack-{{ .ServiceAlias }}-controller
 subjects:
 - kind: ServiceAccount
   name: {{ "{{ include \"service-account.name\" . }}" }}
diff --git a/templates/helm/templates/role-reader.yaml.tpl b/templates/helm/templates/role-reader.yaml.tpl
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   creationTimestamp: null
-  name: ack-{{ .ServiceIDClean }}-reader
+  name: ack-{{ .ServiceAlias }}-reader
   namespace: {{ "{{ .Release.Namespace }}" }}
 rules:
 - apiGroups:
diff --git a/templates/helm/templates/role-writer.yaml.tpl b/templates/helm/templates/role-writer.yaml.tpl
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   creationTimestamp: null
-  name: ack-{{ .ServiceIDClean }}-writer
+  name: ack-{{ .ServiceAlias }}-writer
   namespace: {{ "{{ .Release.Namespace }}" }}
 rules:
 - apiGroups:
diff --git a/templates/helm/values.yaml.tpl b/templates/helm/values.yaml.tpl
@@ -1,4 +1,4 @@
-# Default values for ack-{{ .ServiceIDClean }}-controller.
+# Default values for ack-{{ .ServiceAlias }}-controller.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
diff --git a/templates/pkg/resource/descriptor.go.tpl b/templates/pkg/resource/descriptor.go.tpl
@@ -10,7 +10,7 @@ import (
 	k8sapirt "k8s.io/apimachinery/pkg/runtime"
 	k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
-	svcapitypes "github.com/aws-controllers-k8s/{{ .ServiceIDClean }}-controller/apis/{{ .APIVersion }}"
+	svcapitypes "github.com/aws-controllers-k8s/{{ .ServiceAlias }}-controller/apis/{{ .APIVersion }}"
 )
 
 const (
diff --git a/templates/pkg/resource/manager.go.tpl b/templates/pkg/resource/manager.go.tpl
@@ -20,8 +20,8 @@ import (
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
 
-	svcsdk "github.com/aws/aws-sdk-go/service/{{ .ServiceIDClean }}"
-	svcsdkapi "github.com/aws/aws-sdk-go/service/{{ .ServiceIDClean }}/{{ .ServiceIDClean }}iface"
+	svcsdk "github.com/aws/aws-sdk-go/service/{{ .ServiceAlias }}"
+	svcsdkapi "github.com/aws/aws-sdk-go/service/{{ .ServiceAlias }}/{{ .ServiceAlias }}iface"
 )
 
 // +kubebuilder:rbac:groups={{ .APIGroup }},resources={{ ToLower .CRD.Plural }},verbs=get;list;watch;create;update;patch;delete
@@ -163,7 +163,7 @@ func (rm *resourceManager) Delete(
 // name for the resource
 func (rm *resourceManager) ARNFromName(name string) string {
 	return fmt.Sprintf(
-		"arn:aws:{{ .ServiceIDClean }}:%s:%s:%s",
+		"arn:aws:{{ .ServiceAlias }}:%s:%s:%s",
 		rm.awsRegion,
 		rm.awsAccountID,
 		name,
diff --git a/templates/pkg/resource/manager_factory.go.tpl b/templates/pkg/resource/manager_factory.go.tpl
@@ -13,7 +13,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/go-logr/logr"
 
-	svcresource "github.com/aws-controllers-k8s/{{ .ServiceIDClean }}-controller/pkg/resource"
+	svcresource "github.com/aws-controllers-k8s/{{ .ServiceAlias }}-controller/pkg/resource"
 )
 
 // resourceManagerFactory produces resourceManager objects. It implements the
diff --git a/templates/pkg/resource/resource.go.tpl b/templates/pkg/resource/resource.go.tpl
@@ -9,7 +9,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	k8srt "k8s.io/apimachinery/pkg/runtime"
 
-	svcapitypes "github.com/aws-controllers-k8s/{{ .ServiceIDClean }}-controller/apis/{{ .APIVersion}}"
+	svcapitypes "github.com/aws-controllers-k8s/{{ .ServiceAlias }}-controller/apis/{{ .APIVersion}}"
 )
 
 // Hack to avoid import errors during build...
diff --git a/templates/pkg/resource/sdk.go.tpl b/templates/pkg/resource/sdk.go.tpl
@@ -12,11 +12,11 @@ import (
 	ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors"
 	ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log"
 	"github.com/aws/aws-sdk-go/aws"
-	svcsdk "github.com/aws/aws-sdk-go/service/{{ .ServiceIDClean }}"
+	svcsdk "github.com/aws/aws-sdk-go/service/{{ .ServiceAlias }}"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	svcapitypes "github.com/aws-controllers-k8s/{{.ServiceIDClean }}-controller/apis/{{ .APIVersion }}"
+	svcapitypes "github.com/aws-controllers-k8s/{{.ServiceAlias }}-controller/apis/{{ .APIVersion }}"
 )
 
 // Hack to avoid import errors during build...
