Merge pull request #34 from moficodes/static

add awx build for infra
ibm-avocados · Oct 10, 2020 · fd67501 · fd67501
2 parents e1f484f + e9ab842
commit fd67501
Show file tree

Hide file tree

Showing 9 changed files with 317 additions and 70 deletions.
diff --git a/client/src/pages/create/CreateForm.js b/client/src/pages/create/CreateForm.js
diff --git a/cmd/web/main.go b/cmd/web/main.go
@@ -51,6 +51,8 @@ func main() {
 		Format: "method=${method}, uri=${uri}, status=${status}, time=${latency_human}\n",
 	}))
 
+	api.POST("/auth/check", server.CheckApiKeyHandler)
+
 	api.GET("/clusters/versions", server.VersionEndpointHandler)
 	api.GET("/clusters/locations", server.LocationEndpointHandler)
 	api.GET("/clusters/:geo/locations", server.LocationGeoEndpointHandler)
@@ -102,6 +104,7 @@ func main() {
 	api.PUT("/notification/email/remove", server.RemoveAdminEmails)
 	api.DELETE("/notification/email", server.DeleteAdminEmails)
 
+	// api.POST("/awx/cluster", server.CreateClusterWithAWX)
 	api.GET("/awx/workflowjobtemplate", server.GetAWXWorkflowJobTemplates)
 	api.GET("/awx/jobtemplate", server.GetAWXJobTemplates)
 	api.POST("/awx/workflowjobtemplate/launch", server.LaunchAWXWorkflowJobTemplate)

diff --git a/config/web-deployment.yaml b/config/web-deployment.yaml
@@ -21,7 +21,7 @@ spec:
         run:  admin
     spec:
       containers:
-      - image:  moficodes/ibmcloud-kubernetes-admin:v0.2.19
+      - image:  moficodes/ibmcloud-kubernetes-admin:v0.2.20
         imagePullPolicy: Always
         name:  kubeadmin
         env:

diff --git a/internals/server/account.go b/internals/server/account.go
@@ -1,6 +1,9 @@
 package server
 
 import (
+	"encoding/json"
+	"errors"
+	"fmt"
 	"log"
 	"net/http"
 
@@ -36,3 +39,31 @@ func AccountListHandler(c echo.Context) error {
 	}
 	return c.JSON(http.StatusOK, accounts)
 }
+
+func CheckApiKeyHandler(c echo.Context) error {
+	session, err := getCloudSessions(c)
+	if err != nil {
+		return err
+	}
+
+	var body map[string]interface{}
+	decoder := json.NewDecoder(c.Request().Body)
+	err = decoder.Decode(&body)
+	if err != nil {
+		return err
+	}
+
+	_apikey, ok := body["apikey"]
+	if !ok {
+		return errors.New("no apikey attached to body")
+	}
+
+	apikey := fmt.Sprintf("%v", _apikey)
+
+	apikeyDetails, err := session.CheckToken(apikey)
+	if err != nil {
+		return err
+	}
+
+	return c.JSON(http.StatusOK, apikeyDetails)
+}
diff --git a/internals/server/awx.go b/internals/server/awx.go
@@ -20,7 +20,7 @@ func GetAWXWorkflowJobTemplates(c echo.Context) error {
 	query := c.QueryParam("labels")
 	fmt.Println("QUERY: ", query)
 
-	var result []awx.ResultsWorkflowTemplate
+	result := make([]awx.ResultsWorkflowTemplate, 0)
 	if query == "" {
 		result = templates.Results
 	} else {
@@ -55,11 +55,14 @@ func LaunchAWXWorkflowJobTemplate(c echo.Context) error {
 	decoder := json.NewDecoder(c.Request().Body)
 	err := decoder.Decode(&body)
 	if err != nil {
+		fmt.Println("1:", err)
 		return err
 	}
 
 	res, err := awx.LaunchWorkflowJobTemplate(token, body)
 	if err != nil {
+		fmt.Println("2:", err)
+
 		return err
 	}
 

diff --git a/pkg/awx/api.go b/pkg/awx/api.go
@@ -1,6 +1,9 @@
 package awx
 
-import "encoding/json"
+import (
+	"encoding/json"
+	"fmt"
+)
 
 const (
 	protocol    = "https://"
@@ -38,11 +41,14 @@ func launchWorkflowJobTemplate(token string, body WorkflowJobTeplatesLaunchBody)
 
 	b, err := json.Marshal(body)
 	if err != nil {
+		fmt.Println(":3", err)
 		return nil, err
 	}
 
 	err = postBody(endpont, header, nil, b, &res)
 	if err != nil {
+		fmt.Println(":4", err)
+
 		return nil, err
 	}
 	return res, nil

diff --git a/pkg/ibmcloud/api.go b/pkg/ibmcloud/api.go
@@ -43,6 +43,7 @@ const (
 	tagEndpoint          = protocol + subdomainTags + api + "/v3/tags"
 	billingEndpoint      = protocol + subdomainBilling + api + "/v4/accounts"
 	resourceEndoint      = protocol + subdomainResourceController + api + "/v1/resource_groups"
+	apikeyEndpoint       = protocol + subdomainIAM + api + "/v1/apikeys"
 )
 
 const (
@@ -120,6 +121,24 @@ func getToken(endpoint string, otp string) (*Token, error) {
 	return &result, nil
 }
 
+func checkToken(token, apikey string) (*ApiKeyDetails, error) {
+	header := map[string]string{
+		"Authorization": "Bearer " + token,
+		"IAM-Apikey":    apikey,
+	}
+
+	endpoint := apikeyEndpoint + "/details"
+
+	var res ApiKeyDetails
+	err := fetch(endpoint, header, nil, &res)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &res, nil
+}
+
 func getTokenFromIAM(endpoint string, apikey string) (*Token, error) {
 	header := map[string]string{
 		"Authorization": basicAuth,

diff --git a/pkg/ibmcloud/session.go b/pkg/ibmcloud/session.go
@@ -158,6 +158,14 @@ func bindAccountToToken(refreshToken, accountID string) (*Session, error) {
 	return &Session{Token: token}, nil
 }
 
+func (s *Session) CheckToken(apikey string) (*ApiKeyDetails, error) {
+	apiKeyDetails, err := checkToken(s.Token.AccessToken, apikey)
+	if err != nil {
+		return nil, err
+	}
+	return apiKeyDetails, nil
+}
+
 // BindAccountToToken upgrades session with account
 func (s *Session) BindAccountToToken(accountID string) (*Session, error) {
 	session, err := bindAccountToToken(s.Token.RefreshToken, accountID)

diff --git a/pkg/ibmcloud/types.go b/pkg/ibmcloud/types.go
@@ -579,3 +579,17 @@ type ClusterRequest struct {
 	SkipPermPrecheck             bool   `json:"skipPermPrecheck"`
 	WorkerNum                    int    `json:"workerNum"`
 }
+
+type ApiKeyDetails struct {
+	ID          string `json:"id"`
+	EntityTag   string `json:"entity_tag"`
+	Crn         string `json:"crn"`
+	Locked      bool   `json:"locked"`
+	CreatedAt   string `json:"created_at"`
+	CreatedBy   string `json:"created_by"`
+	ModifiedAt  string `json:"modified_at"`
+	Name        string `json:"name"`
+	Description string `json:"description"`
+	IamID       string `json:"iam_id"`
+	AccountID   string `json:"account_id"`
+}