Refactor orgid and user auth and move them into new structs

Signed-off-by: Burak Sekili <buraksekili@gmail.com>
TykTechnologies · Nov 3, 2023 · 5283493 · 5283493
1 parent 2590ee7
commit 5283493
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/data/config.go b/data/config.go
@@ -63,13 +63,22 @@ type TykAdmin struct {
 	EmailAddress string
 	// Password corresponds to the password of the admin being created.
 	Password string
+
+	// Auth corresponds to Tyk Dashboard API Access Credentials of the admin user, and it will be used
+	// in Authorization header of the HTTP requests that will be sent to Tyk for bootstrapping.
+	// Also, if bootstrapping Tyk Operator Secret is enabled Auth corresponds to TykAuth field in the
+	// Kubernetes secret of Tyk Operator.
+	Auth string `ignored:"true"`
 }
 
 type TykOrg struct {
 	// Name corresponds to the name for your organization that is going to be bootstrapped in Tyk
 	Name string
 	// Cname corresponds to the Organisation CNAME which is going to bind the Portal to.
 	Cname string
+
+	// ID corresponds to the organisation ID that is being created.
+	ID string `ignored:"true"`
 }
 
 type TykConf struct {
@@ -79,12 +88,6 @@ type TykConf struct {
 	Org TykOrg
 
 	DashboardLicense string
-
-	// UserAuth corresponds to AuthCode of the created user, and it will be used in Authorization header
-	// of the HTTP requests that will be sent to Tyk for bootstrapping. Also, if bootstrapping Operator Secret
-	// is enabled via TODO: add here, UserAuth corresponds to TykAuth field in the Kubernetes secret for Tyk Operator.
-	UserAuth string `ignored:"true"`
-	OrgId    string `ignored:"true"`
 }
 
 var BootstrapConf = Config{}

diff --git a/helpers/operator.go b/helpers/operator.go
@@ -58,8 +58,8 @@ func BootstrapTykOperatorSecret() error {
 
 func CreateTykOperatorSecret(clientset *kubernetes.Clientset) error {
 	secretData := map[string][]byte{
-		TykAuth: []byte(data.BootstrapConf.Tyk.UserAuth),
-		TykOrg:  []byte(data.BootstrapConf.Tyk.OrgId),
+		TykAuth: []byte(data.BootstrapConf.Tyk.Admin.Auth),
+		TykOrg:  []byte(data.BootstrapConf.Tyk.Org.ID),
 		TykMode: []byte(TykModePro),
 		TykUrl:  []byte(data.BootstrapConf.K8s.DashboardSvcUrl),
 	}
@@ -127,8 +127,8 @@ func BootstrapTykPortalSecret() error {
 
 func CreateTykPortalSecret(clientset *kubernetes.Clientset, secretName string) error {
 	secretData := map[string][]byte{
-		TykAuth: []byte(data.BootstrapConf.Tyk.UserAuth),
-		TykOrg:  []byte(data.BootstrapConf.Tyk.OrgId),
+		TykAuth: []byte(data.BootstrapConf.Tyk.Admin.Auth),
+		TykOrg:  []byte(data.BootstrapConf.Tyk.Org.ID),
 	}
 
 	objectMeta := metav1.ObjectMeta{Name: secretName}

diff --git a/helpers/portal.go b/helpers/portal.go
@@ -69,7 +69,7 @@ func SetPortalCname(client http.Client) error {
 		return err
 	}
 
-	req.Header.Set(data.AuthorizationHeader, data.BootstrapConf.Tyk.UserAuth)
+	req.Header.Set(data.AuthorizationHeader, data.BootstrapConf.Tyk.Admin.Auth)
 
 	res, err := client.Do(req)
 	if err != nil {
@@ -87,7 +87,7 @@ func SetPortalCname(client http.Client) error {
 func InitialiseCatalogue(client http.Client) error {
 	fmt.Println("Initialising Catalogue")
 
-	initCatalog := InitCatalogReq{OrgId: data.BootstrapConf.Tyk.OrgId}
+	initCatalog := InitCatalogReq{OrgId: data.BootstrapConf.Tyk.Org.ID}
 
 	reqBody, err := json.Marshal(initCatalog)
 	if err != nil {
@@ -103,7 +103,7 @@ func InitialiseCatalogue(client http.Client) error {
 		return err
 	}
 
-	req.Header.Set(data.AuthorizationHeader, data.BootstrapConf.Tyk.UserAuth)
+	req.Header.Set(data.AuthorizationHeader, data.BootstrapConf.Tyk.Admin.Auth)
 
 	res, err := client.Do(req)
 	if err != nil || res.StatusCode != http.StatusOK {
@@ -142,7 +142,7 @@ func CreatePortalHomepage(client http.Client) error {
 		return err
 	}
 
-	req.Header.Set(data.AuthorizationHeader, data.BootstrapConf.Tyk.UserAuth)
+	req.Header.Set(data.AuthorizationHeader, data.BootstrapConf.Tyk.Admin.Auth)
 
 	res, err := client.Do(req)
 	if err != nil || res.StatusCode != http.StatusOK {
@@ -231,7 +231,7 @@ func CreatePortalDefaultSettings(client http.Client) error {
 		data.BootstrapConf.K8s.DashboardSvcUrl+ApiPortalConfigurationEndpoint,
 		nil,
 	)
-	req.Header.Set(data.AuthorizationHeader, data.BootstrapConf.Tyk.UserAuth)
+	req.Header.Set(data.AuthorizationHeader, data.BootstrapConf.Tyk.Admin.Auth)
 
 	if err != nil {
 		return err

diff --git a/helpers/user.go b/helpers/user.go
@@ -71,14 +71,14 @@ func GenerateDashboardCredentials(client http.Client) error {
 		return err
 	}
 
-	data.BootstrapConf.Tyk.OrgId = orgId
+	data.BootstrapConf.Tyk.Org.ID = orgId
 
 	userAuth, err := CreateUser(client, data.BootstrapConf.K8s.DashboardSvcUrl, orgId)
 	if err != nil {
 		return err
 	}
 
-	data.BootstrapConf.Tyk.UserAuth = userAuth
+	data.BootstrapConf.Tyk.Admin.Auth = userAuth
 
 	return nil
 }