Add additional keys to adopted resource spec (#13)

Issue #, if available: aws-controllers-k8s/community#766

Some resources require more than an ARN/Name/ID to describe a single resource. This PR adds an `additionalKeys` field to the `AWSIdentifiers` to allow for arbitrary identifiers as needed by any resources.

Generator code to support this change: aws-controllers-k8s/code-generator#62

Author: RedbackThomson

apis/core/v1alpha1/identifiers.go

@@ -20,15 +20,18 @@ type AWSIdentifiers struct {
 	ARN *AWSResourceName `json:"arn,omitempty"`
 	// NameOrId is a user-supplied string identifier for the resource. It may
 	// or may not be globally unique, depending on the type of resource.
-	NameOrID *string `json:"nameOrID,omitempty"`
+	NameOrID string `json:"nameOrID,omitempty"`
+	// AdditionalKeys represents any additional arbitrary identifiers used when
+	// describing the target resource.
+	AdditionalKeys map[string]string `json:"additionalKeys,omitempty"`
 }
 
 // TargetKubernetesResource provides all the values necessary to identify a given ACK type
 // and override any metadata values when creating a resource of that type.
 type TargetKubernetesResource struct {
 	// +kubebuilder:validation:Required
-	Group *string `json:"group"`
+	Group string `json:"group"`
 	// +kubebuilder:validation:Required
-	Kind     *string            `json:"kind"`
+	Kind     string             `json:"kind"`
 	Metadata *PartialObjectMeta `json:"metadata,omitempty"`
 }

apis/core/v1alpha1/zz_generated.deepcopy.go

@@ -40,6 +40,12 @@ spec:
                 description: AWSIdentifiers provide all unique ways to reference an
                   AWS resource.
                 properties:
+                  additionalKeys:
+                    additionalProperties:
+                      type: string
+                    description: AdditionalKeys represents any additional arbitrary
+                      identifiers used when describing the target resource.
+                    type: object
                   arn:
                     description: ARN is the AWS Resource Name for the resource. It
                       is a globally unique identifier.

config/crd/bases/services.k8s.aws_adoptedresources.yaml

@@ -337,8 +337,8 @@ func (r *adoptionReconciler) getTargetResourceGroupKind(
 	res *ackv1alpha1.AdoptedResource,
 ) schema.GroupKind {
 	return schema.GroupKind{
-		Group: *res.Spec.Kubernetes.Group,
-		Kind:  *res.Spec.Kubernetes.Kind,
+		Group: res.Spec.Kubernetes.Group,
+		Kind:  res.Spec.Kubernetes.Kind,
 	}
 }