Feature/fix poms (#4)

* Updated javadoc settings in poms

Signed-off-by: Knut-Erik Johnsen <[email protected]>

* Switched naming of tags/releases

Signed-off-by: Knut-Erik Johnsen <[email protected]>

* Added springboot starter and example. Reverted to version 1.14 to cover more releases

Signed-off-by: Knut-Erik Johnsen <[email protected]>

* Cleanup naming ved using autoregister functionality

Signed-off-by: Knut-Erik Johnsen <[email protected]>

---------

Signed-off-by: Knut-Erik Johnsen <[email protected]>

Author: knutejoh

crossplane-crd-model/src/main/resources/kubernetes/apiextensions.crossplane.io_compositeresourcedefinitions.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: environmentconfigs.apiextensions.crossplane.io
 spec:
   group: apiextensions.crossplane.io
@@ -28,26 +28,20 @@ spec:
           values.
         properties:
           apiVersion:
-            description: |-
-              APIVersion defines the versioned schema of this representation of an object.
-              Servers should convert recognized schemas to the latest internal value, and
-              may reject unrecognized values.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
             type: string
           data:
             additionalProperties:
               x-kubernetes-preserve-unknown-fields: true
-            description: |-
-              The data of this EnvironmentConfig.
-              This may contain any kind of structure that can be serialized into JSON.
+            description: The data of this EnvironmentConfig. This may contain any
+              kind of structure that can be serialized into JSON.
             type: object
           kind:
-            description: |-
-              Kind is a string value representing the REST resource this object represents.
-              Servers may infer this from the endpoint the client submits requests to.
-              Cannot be updated.
-              In CamelCase.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
             type: string
           metadata:
             type: object

crossplane-crd-model/src/main/resources/kubernetes/apiextensions.crossplane.io_compositionrevisions.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: usages.apiextensions.crossplane.io
 spec:
   group: apiextensions.crossplane.io
@@ -32,19 +32,14 @@ spec:
           resources.
         properties:
           apiVersion:
-            description: |-
-              APIVersion defines the versioned schema of this representation of an object.
-              Servers should convert recognized schemas to the latest internal value, and
-              may reject unrecognized values.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
             type: string
           kind:
-            description: |-
-              Kind is a string value representing the REST resource this object represents.
-              Servers may infer this from the endpoint the client submits requests to.
-              Cannot be updated.
-              In CamelCase.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
             type: string
           metadata:
             type: object
@@ -58,9 +53,7 @@ spec:
                     description: API version of the referent.
                     type: string
                   kind:
-                    description: |-
-                      Kind of the referent.
-                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                    description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
                     type: string
                   resourceRef:
                     description: Reference to the resource.
@@ -72,14 +65,12 @@ spec:
                     - name
                     type: object
                   resourceSelector:
-                    description: |-
-                      Selector to the resource.
-                      This field will be ignored if ResourceRef is set.
+                    description: Selector to the resource. This field will be ignored
+                      if ResourceRef is set.
                     properties:
                       matchControllerRef:
-                        description: |-
-                          MatchControllerRef ensures an object with the same controller reference
-                          as the selecting object is selected.
+                        description: MatchControllerRef ensures an object with the
+                          same controller reference as the selecting object is selected.
                         type: boolean
                       matchLabels:
                         additionalProperties:
@@ -100,9 +91,7 @@ spec:
                     description: API version of the referent.
                     type: string
                   kind:
-                    description: |-
-                      Kind of the referent.
-                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                    description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
                     type: string
                   resourceRef:
                     description: Reference to the resource.
@@ -114,14 +103,12 @@ spec:
                     - name
                     type: object
                   resourceSelector:
-                    description: |-
-                      Selector to the resource.
-                      This field will be ignored if ResourceRef is set.
+                    description: Selector to the resource. This field will be ignored
+                      if ResourceRef is set.
                     properties:
                       matchControllerRef:
-                        description: |-
-                          MatchControllerRef ensures an object with the same controller reference
-                          as the selecting object is selected.
+                        description: MatchControllerRef ensures an object with the
+                          same controller reference as the selecting object is selected.
                         type: boolean
                       matchLabels:
                         additionalProperties:
@@ -158,15 +145,13 @@ spec:
                   description: A Condition that may apply to a resource.
                   properties:
                     lastTransitionTime:
-                      description: |-
-                        LastTransitionTime is the last time this condition transitioned from one
-                        status to another.
+                      description: LastTransitionTime is the last time this condition
+                        transitioned from one status to another.
                       format: date-time
                       type: string
                     message:
-                      description: |-
-                        A Message containing details about this condition's last transition from
-                        one status to another, if any.
+                      description: A Message containing details about this condition's
+                        last transition from one status to another, if any.
                       type: string
                     reason:
                       description: A Reason for this condition's last transition from
@@ -177,9 +162,8 @@ spec:
                         False, or Unknown?
                       type: string
                     type:
-                      description: |-
-                        Type of this condition. At most one of each condition type may apply to
-                        a resource at any point in time.
+                      description: Type of this condition. At most one of each condition
+                        type may apply to a resource at any point in time.
                       type: string
                   required:
                   - lastTransitionTime

crossplane-crd-model/src/main/resources/kubernetes/apiextensions.crossplane.io_compositions.yaml

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-release="release-1.16"
+release="release-1.14"
 
 apiextensions=$(gh api --jq '.[].name' "/repos/crossplane/crossplane/contents/cluster/crds?ref=${release}" | grep apiextensions)
 

crossplane-crd-model/src/main/resources/kubernetes/apiextensions.crossplane.io_environmentconfigs.yaml

@@ -1,6 +1,10 @@
-package io.crossplane.compositefunctions;
+package io.crossplane.compositefunctions.base;
 
-import io.crossplane.compositefunctions.protobuf.*;
+
+import io.crossplane.compositefunctions.protobuf.FunctionRunnerServiceGrpc;
+import io.crossplane.compositefunctions.protobuf.RunFunctionRequest;
+import io.crossplane.compositefunctions.protobuf.RunFunctionResponse;
+import io.crossplane.compositefunctions.protobuf.State;
 import io.grpc.stub.StreamObserver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,11 +29,12 @@ public void runFunction(RunFunctionRequest request, StreamObserver<RunFunctionRe
             State desired = request.getDesired();
 
             // Copy existing state into new desired state
-            // Should these be sent to the function? Probably?
             desiredBuilder.putAllResources(desired.getResourcesMap());
 
             CrossplaneFunctionRequest crossplaneFunctionRequest = new CrossplaneFunctionRequest(request.getObserved(),
-                    request.getExtraResourcesMap(), request.getCredentialsMap());
+                    request.getDesired());
+
+            // request.getExtraResourcesMap(), request.getCredentialsMap()
 
             logger.debug("Calling method with implemented logic");
             CrossplaneFunctionResponse crossplaneFunctionResponse = runFunction(crossplaneFunctionRequest);
@@ -39,15 +44,26 @@ public void runFunction(RunFunctionRequest request, StreamObserver<RunFunctionRe
                 desiredBuilder.putResources(entry.getKey(), CrossplaneObjectToProtobufConverter.convertToResource(entry.getValue()));
             }
 
-            Requirements requirements = Requirements.newBuilder()
-                    .putAllExtraResources(crossplaneFunctionResponse.resourceSelectors())
-                    .build();
+            RunFunctionResponse.Builder responseBuilder = RunFunctionResponse.newBuilder();
+
+            /*
+            if (! crossplaneFunctionResponse.resourceSelectors().isEmpty()) {
+                Requirements requirements = Requirements.newBuilder()
+                        .putAllExtraResources(crossplaneFunctionResponse.resourceSelectors())
+                        .build();
+                responseBuilder.setRequirements(requirements);
+            }
+            */
+
+            if (! crossplaneFunctionResponse.results().isEmpty()) {
+                responseBuilder.addAllResults(crossplaneFunctionResponse.results());
+            }
+
+            if (desiredBuilder.getResourcesCount() > 0) {
+                responseBuilder.setDesired(desiredBuilder.build());
+            }
 
-            RunFunctionResponse runFunctionResponse = RunFunctionResponse
-                    .newBuilder()
-                    .setRequirements(requirements)
-                    .addAllResults(crossplaneFunctionResponse.results())
-                    .setDesired(desiredBuilder.build())
+            RunFunctionResponse runFunctionResponse = responseBuilder
                     .build();
 
             responseObserver.onNext(runFunctionResponse);

crossplane-crd-model/src/main/resources/kubernetes/apiextensions.crossplane.io_usages.yaml

@@ -0,0 +1,18 @@
+package io.crossplane.compositefunctions.base;
+
+import io.crossplane.compositefunctions.protobuf.State;
+
+import java.util.Map;
+
+/**
+ * Holder for the request from crossplane
+ * @param observedState The observedstate of the crossplane resources
+ * @param desiredState The sum of previously called functions state. To override, create a new resource with the same name in the response
+ */
+public record CrossplaneFunctionRequest(State observedState, State desiredState) {
+
+    //  * @param extraResourcesMap A map of any extra resources requested
+    // * @param credentialsMap A map of credentials sent as input
+    // Map<String, Resources> extraResourcesMap,
+    // Map<String, Credentials> credentialsMap
+}

crossplane-crd-model/src/main/resources/kubernetes/fetch.sh

@@ -1,6 +1,5 @@
-package io.crossplane.compositefunctions;
+package io.crossplane.compositefunctions.base;
 
-import io.crossplane.compositefunctions.protobuf.ResourceSelector;
 import io.crossplane.compositefunctions.protobuf.Result;
 
 import java.util.ArrayList;
@@ -11,18 +10,19 @@
 /**
  * Holder for the response to Crossplane
  * @param desiredResources Map of the desired resources
- * @param resourceSelectors Map of the resource selectors for any extra resources
  * @param results List of the results
  */
 public record CrossplaneFunctionResponse(Map<String, Object> desiredResources,
-                                         Map<String, ResourceSelector> resourceSelectors,
                                          List<Result> results) {
 
+    // @param resourceSelectors Map of the resource selectors for any extra resources
+    // Map<String, ResourceSelector> resourceSelectors,
+
 
     /**
      * Create an empty response with all fields initiated
       */
     public CrossplaneFunctionResponse() {
-        this(new HashMap<>(), new HashMap<>(), new ArrayList<>());
+        this(new HashMap<>(), new ArrayList<>());
     }
 }