OCM-16969 | ci: Add a new HCP profile with proxy that is set username/password

Author: yingzhanredhat

go.mod

@@ -29,7 +29,7 @@ require (
 	github.com/nathan-fiscaletti/consolesize-go v0.0.0-20210105204122-a87d9f614b9d
 	github.com/onsi/ginkgo/v2 v2.17.1
 	github.com/onsi/gomega v1.30.0
-	github.com/openshift-online/ocm-common v0.0.29
+	github.com/openshift-online/ocm-common v0.0.31
 	github.com/openshift-online/ocm-sdk-go v0.1.476
 	github.com/pkg/errors v0.9.1
 	github.com/robfig/cron/v3 v3.0.1

go.sum

@@ -278,8 +278,8 @@ github.com/openshift-online/ocm-api-model/clientapi v0.0.431 h1:oGyJaX7ERZZVqVQB
 github.com/openshift-online/ocm-api-model/clientapi v0.0.431/go.mod h1:fZwy5HY2URG9nrExvQeXrDU/08TGqZ16f8oymVEN5lo=
 github.com/openshift-online/ocm-api-model/model v0.0.431 h1:vIuELb0uH2AkN5LMQLYbLrdYIULMEK6ctQkbdoNbEZQ=
 github.com/openshift-online/ocm-api-model/model v0.0.431/go.mod h1:PQIoq6P8Vlb7goOdRMLK8nJY+B7HH0RTqYAa4kyidTE=
-github.com/openshift-online/ocm-common v0.0.29 h1:EyKoLvQXKOa3UpoWHT3cMyNHBbhSZURC8Ws/cxTaT1U=
-github.com/openshift-online/ocm-common v0.0.29/go.mod h1:VEkuZp9aqbXtetZ5ycND6QpvhykvTuBF3oPsVM1X3vI=
+github.com/openshift-online/ocm-common v0.0.31 h1:csxB4UQAUhwhDOVBmOzUKgtemuwV9rhCkzMoeFX8zCQ=
+github.com/openshift-online/ocm-common v0.0.31/go.mod h1:VEkuZp9aqbXtetZ5ycND6QpvhykvTuBF3oPsVM1X3vI=
 github.com/openshift-online/ocm-sdk-go v0.1.476 h1:l5gp/QEqnocqM02m7pDeS9ndXcCTBamewVSGaymd88Y=
 github.com/openshift-online/ocm-sdk-go v0.1.476/go.mod h1:ds+aOAlQbiK0ubZP3CwXkzd7m48v6fMQ1ef9UCrjzBY=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

tests/ci/config/config.go

@@ -40,6 +40,7 @@ type TestConfig struct {
 	ClusterDetailFile               string
 	ClusterInstallLogArtifactFile   string
 	ClusterAdminFile                string
+	ProxyAuthFile                   string
 	ClusterIDPAdminUsernamePassword string
 	TestFocusFile                   string
 	TestLabelFilterFile             string
@@ -121,6 +122,7 @@ func init() {
 	Test.ClusterDetailFile = path.Join(Test.OutputDir, "cluster-detail.json")
 	Test.ClusterInstallLogArtifactFile = path.Join(Test.ArtifactDir, ".install.log")
 	Test.ClusterAdminFile = path.Join(Test.ArtifactDir, ".admin")
+	Test.ProxyAuthFile = path.Join(Test.ArtifactDir, ".proxy-auth")
 	Test.ClusterIDPAdminUsernamePassword = path.Join(Test.ArtifactDir, ".idp-admin-username-password")
 	Test.TestFocusFile = path.Join(Test.RootDir, "tests", "ci", "data", "commit-focus")
 	Test.TestLabelFilterFile = path.Join(Test.RootDir, "tests", "ci", "data", "label-filter")

tests/ci/data/profiles/external.yaml

@@ -216,6 +216,7 @@ profiles:
     kms_key: true
     networking: true
     proxy_enabled: true
+    proxy_type: "auth"
     label_enabled: false
     zones: ""
     tag_enabled: true

tests/utils/handler/cluster_handler.go

@@ -736,8 +736,22 @@ func (ch *clusterHandler) GenerateClusterCreateFlags() ([]string, error) {
 			if proxyName == "" {
 				proxyName = clusterName
 			}
-			proxy, err := resourcesHandler.
-				PrepareProxy(ch.profile.Region, proxyName, config.Test.OutputDir, config.Test.ProxyCABundleFile)
+			proxy := &ProxyDetail{}
+			if ch.profile.ClusterConfig.ProxyType == "auth" {
+				log.Logger.Infof("Proxy auth is enabled. Going to generate the user and password and record in %s",
+					config.Test.ProxyAuthFile)
+				username := "proxyuser"
+				_, password := resourcesHandler.PrepareAdminUser()
+				_, err = helper.CreateFileWithContent(config.Test.ProxyAuthFile, fmt.Sprintf("%s:%s", username, password))
+				if err != nil {
+					return flags, err
+				}
+				proxy, err = resourcesHandler.
+					PrepareProxyWithAuth(ch.profile.Region, proxyName, config.Test.OutputDir, config.Test.ProxyCABundleFile, username, password)
+			} else {
+				proxy, err = resourcesHandler.
+					PrepareProxy(ch.profile.Region, proxyName, config.Test.OutputDir, config.Test.ProxyCABundleFile)
+			}
 			if err != nil {
 				return flags, err
 			}

tests/utils/handler/interface.go

@@ -63,6 +63,7 @@ type ClusterConfig struct {
 	DefaultIngressPrivate         bool   `yaml:"default_ingress_private,omitempty"`
 	Private                       bool   `yaml:"private,omitempty" json:"private,omitempty"`
 	ProxyEnabled                  bool   `yaml:"proxy_enabled,omitempty" json:"proxy_enabled,omitempty"`
+	ProxyType                     string `yaml:"proxy_type,omitempty" json:"proxy_type,omitempty"`
 	STS                           bool   `yaml:"sts,omitempty" json:"sts,omitempty"`
 	SharedVPC                     bool   `yaml:"shared_vpc,omitempty" json:"shared_vpc,omitempty"`
 	TagEnabled                    bool   `yaml:"tag_enabled,omitempty" json:"tag_enabled,omitempty"`
@@ -123,5 +124,7 @@ type ProxyDetail struct {
 	HTTPProxy        string
 	CABundleFilePath string
 	NoProxy          string
+	Username         string
+	Password         string
 	InstanceID       string
 }

tests/utils/handler/resources_handler_prepare.go

@@ -262,11 +262,16 @@ func (rh *resourcesHandler) PrepareSubnets(zones []string, multiZone bool) (map[
 
 func (rh *resourcesHandler) PrepareProxy(zone string, sshPemFileName string, sshPemFileRecordDir string,
 	caFile string) (*ProxyDetail, error) {
+	return rh.PrepareProxyWithAuth(zone, sshPemFileName, sshPemFileRecordDir, caFile, "", "")
+}
+
+func (rh *resourcesHandler) PrepareProxyWithAuth(zone string, sshPemFileName string, sshPemFileRecordDir string,
+	caFile string, username string, password string) (*ProxyDetail, error) {
 
 	if rh.vpc == nil {
 		return nil, errors.New("VPC has not been initialized ...")
 	}
-	instance, privateIP, caContent, err := rh.vpc.LaunchProxyInstance(zone, sshPemFileName, sshPemFileRecordDir)
+	instance, privateIP, caContent, err := rh.vpc.LaunchProxyInstanceWithAuth(zone, sshPemFileName, sshPemFileRecordDir, username, password)
 	if err != nil {
 		return nil, err
 	}
@@ -276,8 +281,8 @@ func (rh *resourcesHandler) PrepareProxy(zone string, sshPemFileName string, ssh
 	}
 	err = rh.registerProxyInstanceID(*instance.InstanceId)
 	return &ProxyDetail{
-		HTTPsProxy:       fmt.Sprintf("https://%s:8080", privateIP),
-		HTTPProxy:        fmt.Sprintf("http://%s:8080", privateIP),
+		HTTPsProxy:       rh.vpc.GetHTTPSProxyURL(privateIP, username, password),
+		HTTPProxy:        rh.vpc.GetProxyURL(privateIP, username, password),
 		CABundleFilePath: caFile,
 		NoProxy:          "quay.io",
 		InstanceID:       *instance.InstanceId,