Merge pull request #687 from vaidehi411/OSD-28274-dt-terraform-promotion

OSD-28274 Dynatrace Config terraform promotion

Author: openshift-merge-bot[bot]

cmd/promote/dynatrace/dt_utils.go

@@ -3,18 +3,25 @@ package dynatrace
 import (
 	"fmt"
 	"os"
+	"os/exec"
+	"path"
 	"path/filepath"
 	"sort"
 	"strings"
 )
 
 const (
 	saasDynatraceDir = "data/services/osd-operators/cicd/saas/saas-dynatrace"
+	moduleDir        = "terraform/modules"
+	ProductionDir    = "terraform/redhat-aws/sd-sre/production"
+	pattern          = "git::https://gitlab.cee.redhat.com/service/dynatrace-config.git//terraform/modules/"
 )
 
 var (
 	ServicesSlice    []string
 	ServicesFilesMap = map[string]string{}
+	ModulesSlice     []string
+	ModulesFilesMap  = map[string]string{}
 )
 
 func listServiceNames(appInterface AppInterface) error {
@@ -139,3 +146,179 @@ func GetSaasDir(component string) (string, error) {
 	}
 	return "", fmt.Errorf("saas directory for service %s not found", component)
 }
+
+func listDynatraceModuleNames(dynatraceConfig DynatraceConfig) error {
+
+	baseDir := dynatraceConfig.GitDirectory
+	_, err := GeModulesNames(baseDir, moduleDir)
+	if err != nil {
+		return err
+	}
+
+	sort.Strings(ModulesSlice)
+	fmt.Println("### Available terraform modules in dynatrace-config ###")
+	for _, module := range ModulesSlice {
+		fmt.Println(module)
+	}
+
+	return nil
+}
+
+func GeModulesNames(baseDir, dir string) ([]string, error) {
+
+	dirGlob := filepath.Join(baseDir, dir)
+	filepaths, err := os.ReadDir(dirGlob)
+
+	if err != nil {
+		return nil, err
+	}
+
+	for _, filepath := range filepaths {
+		if filepath.IsDir() {
+			filename := filepath.Name()
+			ModulesSlice = append(ModulesSlice, filename)
+			ModulesFilesMap[filename] = filepath.Name()
+		}
+	}
+
+	return ModulesSlice, nil
+}
+
+func ValidateModuleName(moduleName string) (string, error) {
+	fmt.Printf("### Checking if service %s exists ###\n", moduleName)
+	for _, service := range ModulesSlice {
+		if service == moduleName {
+			fmt.Printf("Module %s found in dynatrace-config\n", moduleName)
+			return moduleName, nil
+		}
+	}
+
+	return moduleName, fmt.Errorf("service %s not found", moduleName)
+}
+
+func updatePromotionGitHash(module string, dir string, promotionGitHash string) (string, error) {
+
+	fmt.Printf("Iterating over directory : %s", dir)
+	items, _ := os.ReadDir(dir)
+	for _, item := range items {
+		fmt.Println("Production tenant: ", item.Name())
+		if item.IsDir() {
+			subDir := filepath.Join(dir, item.Name())
+			subitems, _ := os.ReadDir(subDir)
+			for _, subitem := range subitems {
+				if subitem.IsDir() {
+					fmt.Println("Folder : ", subitem.Name())
+					subDir2 := filepath.Join(subDir, subitem.Name())
+					subitems2, _ := os.ReadDir(subDir2)
+					for _, subitem2 := range subitems2 {
+						if !subitem2.IsDir() {
+							filePath := filepath.Join(subDir2, subitem2.Name())
+							extension := path.Ext(filePath)
+							if extension == ".tf" {
+								err := updateFileContent(filePath, module, promotionGitHash)
+								if err != nil {
+									return "", fmt.Errorf("error while writing files %s", err)
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return "", nil
+}
+
+func updateFileContent(filePath string, module, promotionGitHash string) error {
+	var filename = filePath
+	file, err := Open(filename)
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	ok := UpdateDefaultValue(file, module, promotionGitHash)
+	if ok {
+		err := Save(filename, file)
+		if err != nil {
+			return fmt.Errorf("Error while updating file %s: %s\n", filename, err)
+		}
+		fmt.Printf("File Updated :%s \n ", filePath)
+		return nil
+	}
+	return nil
+}
+
+func GetProductionDir(baseDir string) string {
+
+	dirGlob := filepath.Join(baseDir, ProductionDir)
+	return dirGlob
+}
+
+func getLatestGitHash(basedir, module string) (string, error) {
+
+	moduleFilePath := filepath.Join(basedir, moduleDir, module)
+	cmd := exec.Command("git", "rev-list", "-n", "1", "HEAD", "--", moduleFilePath)
+	output, err := cmd.Output()
+	if err != nil {
+		return "", fmt.Errorf("failed to get git hash: %v", err)
+	}
+	gitHash := strings.TrimSpace(string(output))
+	fmt.Printf("The head githash for module %s is %s\n", module, gitHash)
+
+	return gitHash, nil
+}
+
+func modulePromotion(dynatraceConfig DynatraceConfig, module string) error {
+
+	baseDir := dynatraceConfig.GitDirectory
+
+	_, err := GeModulesNames(baseDir, moduleDir)
+	if err != nil {
+		return err
+	}
+
+	module, err = ValidateModuleName(module)
+	if err != nil {
+		return fmt.Errorf("Module Name : %s is not valid", module)
+	}
+	fmt.Printf("Module Name : %s is valid", module)
+
+	prodtenantDir := GetProductionDir(baseDir)
+
+	promotionGitHash, err := getLatestGitHash(baseDir, module)
+
+	if err != nil {
+		return fmt.Errorf("failed to checkout and compare git hash: %v", err)
+	}
+
+	fmt.Printf("Module: %s will be promoted to %s\n", module, promotionGitHash)
+
+	branchName := fmt.Sprintf("promote-%s-%s", module, promotionGitHash)
+
+	err = dynatraceConfig.UpdateDynatraceConfig(module, promotionGitHash, branchName)
+	if err != nil {
+		return fmt.Errorf("FAILURE: %v\n", err)
+	}
+
+	promotePattern := pattern + module + "?ref=" + promotionGitHash
+
+	_, err = updatePromotionGitHash(module, prodtenantDir, promotePattern)
+
+	if err != nil {
+		return err
+	}
+	commitLog := "Promote Module " + module + " to GitHash %s" + promotionGitHash
+	fmt.Printf("commitLog: %v\n", commitLog)
+
+	err = dynatraceConfig.commitFiles(commitLog)
+	if err != nil {
+		return fmt.Errorf("failed to commit changes to app-interface: %w", err)
+	}
+
+	fmt.Printf("The branch %s is ready to be pushed\n", branchName)
+	fmt.Println("DT service:", module)
+	fmt.Println("to:", promotionGitHash)
+	fmt.Println("READY TO PUSH,", module, "promotion commit is ready locally")
+	return nil
+}

cmd/promote/dynatrace/dynatrace.go

@@ -4,16 +4,18 @@ import (
 	"fmt"
 	"os"
 
-	git "github.com/openshift/osdctl/cmd/promote/git"
 	"github.com/spf13/cobra"
 )
 
 type promoteDynatraceOptions struct {
 	list bool
 
-	appInterfaceCheckoutDir string
-	gitHash                 string
-	component               string
+	appInterfaceCheckoutDir    string
+	gitHash                    string
+	component                  string
+	terraform                  bool
+	module                     string
+	dynatraceConfigCheckoutDir string
 }
 
 // NewCmdPromote implements the promote command to promote services/operators
@@ -29,48 +31,91 @@ func NewCmdDynatrace() *cobra.Command {
 		osdctl promote dynatrace --list
 
 		# Promote a dynatrace component
-		osdctl promote dynatrace --component <component> --gitHash <git-hash>`,
+		osdctl promote dynatrace --component <component> --gitHash <git-hash>
+
+		# List all dynatrace-config modules available for promotion
+		osdctl promote dynatrace --terraform --list
+
+		# Promote a dynatrace module
+		osdctl promote dynatrace --terraform --module=<module-name>`,
 
 		Run: func(cmd *cobra.Command, args []string) {
-			ops.validateSaasFlow()
-			appInterface := BootstrapOsdCtlForAppInterfaceAndServicePromotions(ops.appInterfaceCheckoutDir)
 
-			if ops.list {
-				if ops.component != "" || ops.gitHash != "" {
-					fmt.Printf("Error: --list cannot be used with any other flags\n\n")
+			if ops.terraform {
+				dynatraceConfig := DynatraceConfigPromotion(ops.dynatraceConfigCheckoutDir)
+				if ops.list {
+					ops.validateSaasFlow()
+					if ops.component != "" || ops.gitHash != "" || ops.module != "" {
+						fmt.Printf("Error: Please provide correct parameters \n\n")
+						fmt.Printf("Please run 'osdctl promote dynatrace --terraform --list' to check available dynatrace-config modules for promotion.\n\n")
+						cmd.Help()
+						os.Exit(1)
+					}
+					listDynatraceModuleNames(dynatraceConfig)
+					os.Exit(0)
+				} else {
+					if ops.module == "" {
+						fmt.Printf("Error: Please provide correct parameters \n\n")
+						fmt.Printf("Please run 'osdctl promote dynatrace --terraform --module=<module-name>' to check promote dynatrace-config module to latest ref.\n\n")
+						cmd.Help()
+						os.Exit(1)
+					} else if ops.component != "" || ops.gitHash != "" {
+						fmt.Printf("Error: Please provide correct parameters \n\n")
+						fmt.Printf("Please run 'osdctl promote dynatrace --terraform --module=<module-name>' to check promote dynatrace-config module to latest ref.\n\n")
+						cmd.Help()
+						os.Exit(1)
+					} else {
+						err := modulePromotion(dynatraceConfig, ops.module)
+						if err != nil {
+							fmt.Printf("Error while promoting module: %v\n", err)
+							os.Exit(1)
+						}
+					}
+				}
+			} else {
+
+				ops.validateSaasFlow()
+				appInterface := BootstrapOsdCtlForAppInterfaceAndServicePromotions(ops.appInterfaceCheckoutDir)
+
+				if ops.list {
+					if ops.component != "" || ops.gitHash != "" {
+						fmt.Printf("Error: --list cannot be used with any other flags\n\n")
+						cmd.Help()
+						os.Exit(1)
+					}
+					listServiceNames(appInterface)
+					os.Exit(0)
+				}
+
+				if ops.component == "" {
+					fmt.Printf("Error: Please provide dynatrace component to promote.\n\n")
+					fmt.Printf("Please run 'osdctl promote dynatrace --list' to check available dynatrace components for promotion.\n\n")
 					cmd.Help()
 					os.Exit(1)
 				}
-				listServiceNames(appInterface)
-				os.Exit(0)
-			}
-
-			if ops.component == "" {
-				fmt.Printf("Error: Please provide dynatrace component to promote.\n\n")
-				fmt.Printf("Please run 'osdctl promote dynatrace --list' to check available dynatrace components for promotion.\n\n")
-				cmd.Help()
-				os.Exit(1)
-			}
-			err := servicePromotion(appInterface, ops.component, ops.gitHash)
-			if err != nil {
-				fmt.Printf("Error while promoting service: %v\n", err)
-				os.Exit(1)
+				err := servicePromotion(appInterface, ops.component, ops.gitHash)
+				if err != nil {
+					fmt.Printf("Error while promoting service: %v\n", err)
+					os.Exit(1)
+				}
 			}
-
 			os.Exit(0)
 		},
 	}
 
 	promoteDynatraceCmd.Flags().BoolVarP(&ops.list, "list", "l", false, "List all SaaS services/operators")
 	promoteDynatraceCmd.Flags().StringVarP(&ops.component, "component", "c", "", "Dynatrace component getting promoted")
 	promoteDynatraceCmd.Flags().StringVarP(&ops.gitHash, "gitHash", "g", "", "Git hash of the SaaS service/operator commit getting promoted")
-	promoteDynatraceCmd.Flags().StringVarP(&ops.appInterfaceCheckoutDir, "appInterfaceDir", "", "", "location of app-interfache checkout. Falls back to `pwd` and "+git.DefaultAppInterfaceDirectory())
+	promoteDynatraceCmd.Flags().StringVarP(&ops.appInterfaceCheckoutDir, "appInterfaceDir", "", "", "location of app-interfache checkout. Falls back to `pwd` and "+DefaultAppInterfaceDirectory())
+	promoteDynatraceCmd.Flags().BoolVarP(&ops.terraform, "terraform", "t", false, "deploy dynatrace-config terraform job")
+	promoteDynatraceCmd.Flags().StringVarP(&ops.module, "module", "m", "", "module to promote")
+	promoteDynatraceCmd.Flags().StringVarP(&ops.appInterfaceCheckoutDir, "dynatraceConfigDir", "", "", "location of dynatrace-config checkout. Falls back to `pwd` and "+DefaultDynatraceconfigDir())
 
 	return promoteDynatraceCmd
 }
 
 func (o *promoteDynatraceOptions) validateSaasFlow() {
-	if o.component == "" && o.gitHash == "" {
+	if o.component == "" && o.gitHash == "" && !o.terraform {
 		fmt.Printf("Usage: For dynatrace component, please provide --component and (optional) --gitHash\n")
 		fmt.Printf("--component is the name of the component, i.e. dynatrace-dynakube\n")
 		fmt.Printf("--gitHash is the target git commit for the dt component, if not specified defaults to HEAD of master\n\n")