Add edgeconnect provisioner mode (#2298)

* added edgeconnect provisioner mode

.mockery.yaml

@@ -15,6 +15,9 @@ packages:
   github.com/Dynatrace/dynatrace-operator/pkg/clients/dynatrace:
     interfaces:
       Client:
+  github.com/Dynatrace/dynatrace-operator/pkg/clients/edgeconnect:
+    interfaces:
+      Client:
   github.com/Dynatrace/dynatrace-operator/pkg/controllers/dynakube/version:
     interfaces:
       StatusUpdater:

config/crd/bases/dynatrace.com_edgeconnects.yaml

@@ -173,6 +173,12 @@ spec:
                   - name
                   type: object
                 type: array
+              hostPatterns:
+                description: Host patterns to be set in the tenant, only considered
+                  when provisioning is enabled.
+                items:
+                  type: string
+                type: array
               hostRestrictions:
                 description: Restrict outgoing HTTP requests to your internal resources
                   to specified hosts
@@ -210,6 +216,11 @@ spec:
                   endpoint:
                     description: Token endpoint URL of Dynatrace SSO
                     type: string
+                  provisioner:
+                    description: Determines if the operator will create the EdgeConnect
+                      and light OAuth client on the cluster using the credentials
+                      provided. Requires more scopes than default behavior.
+                    type: boolean
                   resource:
                     description: URN identifying your account. You get the URN when
                       creating the OAuth client

config/helm/chart/default/templates/Common/crd/dynatrace-operator-crd.yaml

@@ -3851,6 +3851,12 @@ spec:
                   - name
                   type: object
                 type: array
+              hostPatterns:
+                description: Host patterns to be set in the tenant, only considered
+                  when provisioning is enabled.
+                items:
+                  type: string
+                type: array
               hostRestrictions:
                 description: Restrict outgoing HTTP requests to your internal resources
                   to specified hosts
@@ -3888,6 +3894,11 @@ spec:
                   endpoint:
                     description: Token endpoint URL of Dynatrace SSO
                     type: string
+                  provisioner:
+                    description: Determines if the operator will create the EdgeConnect
+                      and light OAuth client on the cluster using the credentials
+                      provided. Requires more scopes than default behavior.
+                    type: boolean
                   resource:
                     description: URN identifying your account. You get the URN when
                       creating the OAuth client

pkg/api/v1alpha1/edgeconnect/edgeconnect_types.go

@@ -61,6 +61,10 @@ type EdgeConnectSpec struct { //nolint:revive
 
 	// Sets topology spread constraints for the EdgeConnect pods
 	TopologySpreadConstraints []corev1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
+
+	// Host patterns to be set in the tenant, only considered when provisioning is enabled.
+	// +kubebuilder:validation:Optional
+	HostPatterns []string `json:"hostPatterns,omitempty"`
 }
 
 type OAuthSpec struct {
@@ -73,6 +77,9 @@ type OAuthSpec struct {
 	// URN identifying your account. You get the URN when creating the OAuth client
 	// +kubebuilder:validation:Required
 	Resource string `json:"resource"`
+	// Determines if the operator will create the EdgeConnect and light OAuth client on the cluster using the credentials provided. Requires more scopes than default behavior.
+	// +kubebuilder:validation:Optional
+	Provisioner bool `json:"provisioner"`
 }
 
 type ImageRefSpec struct {

pkg/clients/edgeconnect/client.go

@@ -15,6 +15,10 @@ import (
 	"golang.org/x/oauth2/clientcredentials"
 )
 
+const (
+	contentTypeJSON = "application/json"
+)
+
 type client struct {
 	ctx        context.Context
 	baseURL    string
@@ -193,6 +197,8 @@ func (c *client) UpdateEdgeConnect(edgeConnectId, name string, hostPatterns []st
 		return err
 	}
 
+	req.Header.Set("Content-Type", contentTypeJSON)
+
 	resp, err := c.httpClient.Do(req)
 	defer utils.CloseBodyAfterRequest(resp)
 
@@ -214,7 +220,6 @@ func (c *client) UpdateEdgeConnect(edgeConnectId, name string, hostPatterns []st
 
 // DeleteEdgeConnect deletes edge connect using DELETE method for give edgeConnectId
 func (c *client) DeleteEdgeConnect(edgeConnectId string) error {
-	log.Info("started removing edge connect %s", edgeConnectId)
 	url := c.getEdgeConnectUrl(edgeConnectId)
 
 	req, err := http.NewRequest(http.MethodDelete, url, nil)
@@ -237,7 +242,6 @@ func (c *client) DeleteEdgeConnect(edgeConnectId string) error {
 		}
 		return errors.Errorf("edgeconnect server error %d: %s", errorResponse.ErrorMessage.Code, errorResponse.ErrorMessage.Message)
 	}
-	log.Info("finished removing edge connect %s", edgeConnectId)
 	return nil
 }
 
@@ -256,7 +260,7 @@ func (c *client) CreateEdgeConnect(name string, hostPatterns []string, oauthClie
 		return CreateResponse{}, err
 	}
 
-	resp, err := c.httpClient.Post(url, http.MethodPost, payloadBuf)
+	resp, err := c.httpClient.Post(url, contentTypeJSON, payloadBuf)
 	defer utils.CloseBodyAfterRequest(resp)
 
 	if err != nil {
@@ -276,3 +280,37 @@ func (c *client) CreateEdgeConnect(name string, hostPatterns []string, oauthClie
 
 	return response, nil
 }
+
+// GetEdgeConnects returns list of edge connects
+func (c *client) GetEdgeConnects(name string) (ListResponse, error) {
+	ecUrl := c.getEdgeConnectsUrl()
+
+	req, err := http.NewRequest("GET", ecUrl, nil)
+	if err != nil {
+		return ListResponse{}, err
+	}
+	req.URL.RawQuery = url.Values{
+		"add-fields": {"name"},
+		"filter":     {fmt.Sprintf("name='%s'", name)},
+	}.Encode()
+
+	resp, err := c.httpClient.Do(req)
+	defer utils.CloseBodyAfterRequest(resp)
+
+	if err != nil {
+		return ListResponse{}, err
+	}
+
+	responseData, err := c.getServerResponseData(resp)
+	if err != nil {
+		return ListResponse{}, err
+	}
+
+	response := ListResponse{}
+	err = json.Unmarshal(responseData, &response)
+	if err != nil {
+		return ListResponse{}, err
+	}
+
+	return response, nil
+}

pkg/clients/edgeconnect/edgeconnect.go

@@ -28,12 +28,20 @@ type GetResponse struct {
 	Metadata         Metadata         `json:"metadata"`
 }
 
+type ListResponse struct {
+	EdgeConnects []GetResponse `json:"edgeConnects"`
+	TotalCount   int           `json:"totalCount"`
+}
+
 type CreateResponse struct {
-	ID               string           `json:"id,omitempty"`
-	Name             string           `json:"name"`
-	HostPatterns     []string         `json:"hostPatterns"`
-	OauthClientId    string           `json:"oauthClientId"`
-	ModificationInfo ModificationInfo `json:"modificationInfo"`
+	ID                  string           `json:"id,omitempty"`
+	Name                string           `json:"name"`
+	HostPatterns        []string         `json:"hostPatterns"`
+	OauthClientId       string           `json:"oauthClientId"`
+	OauthClientSecret   string           `json:"oauthClientSecret"`
+	OauthClientResource string           `json:"oauthClientResource"`
+	ModificationInfo    ModificationInfo `json:"modificationInfo"`
+	Metadata            Metadata         `json:"metadata"`
 }
 
 type Request struct {

pkg/clients/edgeconnect/iface.go

@@ -13,4 +13,7 @@ type Client interface {
 
 	// DeleteEdgeConnect deletes edge connect
 	DeleteEdgeConnect(edgeConnectId string) error
+
+	// GetEdgeConnects returns list of edge connects
+	GetEdgeConnects(name string) (ListResponse, error)
 }

pkg/controllers/edgeconnect/consts/consts.go

@@ -17,6 +17,8 @@ const (
 	PathEdgeConnectOauthClientID     = "oauth/client_id"
 	KeyEdgeConnectOauthClientSecret  = "oauth-client-secret"
 	PathEdgeConnectOauthClientSecret = "oauth/client_secret"
+	KeyEdgeConnectOauthResource      = "oauth-client-resource"
+	KeyEdgeConnectId                 = "id"
 
 	AnnotationEdgeConnectContainerAppArmor = "container.apparmor.security.beta.kubernetes.io/" + EdgeConnectContainerName
 )