remove unused apiproduct field (#53)

* remove unused apiproduct field spec.routing.expose * remove unused apiproduct field spec.information
Kuadrant · Oct 8, 2021 · b23551c · b23551c
1 parent 161e225
commit b23551c
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 60 deletions.
diff --git a/apis/networking/v1beta1/apiproduct_types.go b/apis/networking/v1beta1/apiproduct_types.go
@@ -56,14 +56,8 @@ type SecurityScheme struct {
 	OpenIDConnectAuth *OpenIDConnectAuth `json:"openIDConnectAuth,omitempty"`
 }
 
-type ProductInformation struct {
-	Description string `json:"description"`
-	Owner       string `json:"owner"`
-}
-
 type Routing struct {
-	Hosts  []string `json:"hosts"`
-	Expose bool     `json:"expose"`
+	Hosts []string `json:"hosts"`
 }
 
 type Mapping struct {
@@ -112,12 +106,9 @@ type RateLimitSpec struct {
 
 // APIProductSpec defines the desired state of APIProduct
 type APIProductSpec struct {
-	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
-	Information    ProductInformation `json:"information"`
-	Routing        Routing            `json:"routing"`
-	SecurityScheme []*SecurityScheme  `json:"securityScheme"`
-	APIs           []*APISelector     `json:"APIs"`
+	Routing        Routing           `json:"routing"`
+	SecurityScheme []*SecurityScheme `json:"securityScheme"`
+	APIs           []*APISelector    `json:"APIs"`
 
 	// RateLimit configures global rate limit parameters
 	// +optional

diff --git a/apis/networking/v1beta1/apiproduct_types_test.go b/apis/networking/v1beta1/apiproduct_types_test.go
@@ -24,13 +24,7 @@ import (
 )
 
 func TestAPIProductTypeBasic(t *testing.T) {
-	apiProduct := APIProduct{
-		Spec: APIProductSpec{
-			Information: ProductInformation{
-				Description: "some descr",
-			},
-		},
-	}
+	apiProduct := APIProduct{}
 	_, err := json.MarshalIndent(apiProduct, "", "  ")
 	if err != nil {
 		t.Error(err)

diff --git a/apis/networking/v1beta1/zz_generated.deepcopy.go b/apis/networking/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/networking.kuadrant.io_apiproducts.yaml b/config/crd/bases/networking.kuadrant.io_apiproducts.yaml
@@ -57,18 +57,6 @@ spec:
                   - namespace
                   type: object
                 type: array
-              information:
-                description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
-                  Important: Run "make" to regenerate code after modifying this file'
-                properties:
-                  description:
-                    type: string
-                  owner:
-                    type: string
-                required:
-                - description
-                - owner
-                type: object
               rateLimit:
                 description: RateLimit configures global rate limit parameters
                 properties:
@@ -126,14 +114,11 @@ spec:
                 type: object
               routing:
                 properties:
-                  expose:
-                    type: boolean
                   hosts:
                     items:
                       type: string
                     type: array
                 required:
-                - expose
                 - hosts
                 type: object
               securityScheme:
@@ -174,7 +159,6 @@ spec:
                 type: array
             required:
             - APIs
-            - information
             - routing
             - securityScheme
             type: object

diff --git a/controllers/apiproduct_controller_test.go b/controllers/apiproduct_controller_test.go
@@ -189,10 +189,6 @@ func apiProduct(ns string) *networkingv1beta1.APIProduct {
 		},
 		ObjectMeta: metav1.ObjectMeta{Name: "apiproduct01", Namespace: ns},
 		Spec: networkingv1beta1.APIProductSpec{
-			Information: networkingv1beta1.ProductInformation{
-				Description: "My super nice API Product",
-				Owner:       "whoever@mycompany.com",
-			},
 			Routing: networkingv1beta1.Routing{
 				Hosts: []string{"petstore.127.0.0.1.nip.io"},
 			},

diff --git a/samples/apiproduct.yaml b/samples/apiproduct.yaml
@@ -3,13 +3,9 @@ kind: APIProduct
 metadata:
   name: animaltoys
 spec:
-  information:
-    description: My super nice API Product.
-    owner: whoever@mycompany.com
   routing:
     hosts:
       - api.animaltoys.127.0.0.1.nip.io
-    expose: true
   APIs:
     - name: dogs
       namespace: default