Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OCM-6309 | ci: Verify test case(s) 45161|35878|35896|49137|46187|38850|34102|66362|36128 #1925

Merged
merged 1 commit into from
Apr 15, 2024
Merged

OCM-6309 | ci: Verify test case(s) 45161|35878|35896|49137|46187|38850|34102|66362|36128 #1925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/ci/data/profiles/rosa-classic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ profiles:
shared_vpc: false
ingress_customized: true
oidc_config: unmanaged
admin_enabled: true
admin_enabled: false #TODO// Disable to compatible with current day1. Needs to enable after new day1 enabled for the jobs.
volume_size: 150
autoscaler_enabled: true
disable_uwm: true
Expand Down
10 changes: 3 additions & 7 deletions tests/e2e/test_rosacli_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ var _ = Describe("Edit cluster",

It("can check the description of the cluster - [id:34102]",
labels.Medium,
labels.MigrationToVerify,
labels.Exclude,
func() {
By("Describe cluster in text format")
output, err := clusterService.DescribeCluster(clusterID)
Expand All @@ -68,7 +66,7 @@ var _ = Describe("Edit cluster",
Expect(CD.ID).To(Equal(jsonData.DigString("id")))
Expect(CD.ExternalID).To(Equal(jsonData.DigString("external_id")))
Expect(CD.ChannelGroup).To(Equal(jsonData.DigString("version", "channel_group")))
Expect(CD.DNS).To(Equal(jsonData.DigString("name") + "." + jsonData.DigString("dns", "base_domain")))
Expect(CD.DNS).To(Equal(jsonData.DigString("domain_prefix") + "." + jsonData.DigString("dns", "base_domain")))
Expect(CD.AWSAccount).NotTo(BeEmpty())
Expect(CD.APIURL).To(Equal(jsonData.DigString("api", "url")))
Expect(CD.ConsoleURL).To(Equal(jsonData.DigString("console", "url")))
Expand Down Expand Up @@ -105,8 +103,6 @@ var _ = Describe("Edit cluster",

It("can restrict master API endpoint to direct, private connectivity or not - [id:38850]",
labels.High,
labels.MigrationToVerify,
labels.Exclude,
func() {
By("Check the cluster is not private cluster")
private, err := clusterService.IsPrivateCluster(clusterID)
Expand Down Expand Up @@ -236,8 +232,6 @@ var _ = Describe("Edit cluster",

It("can allow sts cluster installation with compatible policies - [id:45161]",
labels.High,
labels.MigrationToVerify,
labels.Exclude,
func() {
By("Check the cluster is STS cluster or skip")
isSTSCluster, err := clusterService.IsSTSCluster(clusterID)
Expand Down Expand Up @@ -282,7 +276,9 @@ var _ = Describe("Edit cluster",
replacingFlags := map[string]string{
"--version": clusterVersion,
"--cluster-name": clusterName,
"-c": clusterName,
"--operator-roles-prefix": operatorPrefix,
"--domain-prefix": clusterName,
}

if rosalCommand.GetFlagValue("--https-proxy", true) != "" {
Expand Down
5 changes: 2 additions & 3 deletions tests/e2e/test_rosacli_iam_roles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,8 +785,6 @@ var _ = Describe("Edit IAM",

It("can create/delete/unlink/link ocm-roles in auto mode - [id:46187]",
labels.High,
labels.MigrationToVerify,
labels.Exclude,
func() {
var (
ocmrolePrefix string
Expand Down Expand Up @@ -866,7 +864,8 @@ var _ = Describe("Edit IAM",
"-y")
Expect(err).NotTo(BeNil())
textData = rosaClient.Parser.TextData.Input(output).Parse().Tip()
Expect(textData).Should(ContainSubstring("There was an error creating the ocm role: NoSuchEntity"))
Expect(textData).Should(ContainSubstring("There was an error creating the ocm role"))
Expect(textData).Should(ContainSubstring("NoSuchEntity"))

By("Create an ocm-role")
output, err = ocmResourceService.CreateOCMRole("--mode", "auto",
Expand Down
44 changes: 16 additions & 28 deletions tests/e2e/test_rosacli_idp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,9 @@ var _ = Describe("Edit IDP",
defer GinkgoRecover()

var (
clusterID string

clusterID string
rosaClient *rosacli.Client
idpService rosacli.IDPService

rosaSensitiveClient *rosacli.Client
idpServiceSensitive rosacli.IDPService
)

BeforeEach(func() {
Expand All @@ -40,24 +36,20 @@ var _ = Describe("Edit IDP",
By("Init the clients")
rosaClient = rosacli.NewClient()
idpService = rosaClient.IDP
rosaSensitiveClient = rosacli.NewSensitiveClient()
idpServiceSensitive = rosaSensitiveClient.IDP

})

AfterEach(func() {
By("Clean remaining resources")
var errorList []error
errorList = append(errorList, rosaClient.CleanResources(clusterID))
errorList = append(errorList, rosaSensitiveClient.CleanResources(clusterID))
errorList = append(errorList, rosaClient.CleanResources(clusterID))
Expect(errors.Join(errorList...)).ToNot(HaveOccurred())

})

It("can create/describe/delete admin user - [id:35878]",
labels.Critical,
labels.MigrationToVerify,
labels.Exclude,
func() {
var (
idpType = "htpasswd"
Expand All @@ -75,7 +67,7 @@ var _ = Describe("Edit IDP",
output, err = rosaClient.User.DescribeAdmin(clusterID)
Expect(err).To(BeNil())
textData = rosaClient.Parser.TextData.Input(output).Parse().Tip()
Expect(textData).Should(ContainSubstring("There is an admin on cluster"))
Expect(textData).Should(ContainSubstring("There is 'cluster-admin' user on cluster"))

By("List IDP")
idpTab, _, err := idpService.ListIDP(clusterID)
Expand All @@ -92,7 +84,7 @@ var _ = Describe("Edit IDP",
output, err = rosaClient.User.DescribeAdmin(clusterID)
Expect(err).To(BeNil())
textData = rosaClient.Parser.TextData.Input(output).Parse().Tip()
Expect(textData).Should(ContainSubstring("There is no admin on cluster"))
Expect(textData).Should(ContainSubstring("WARN: There is no 'cluster-admin' user on cluster"))

By("List IDP after the admin is deleted")
idpTab, _, err = idpService.ListIDP(clusterID)
Expand All @@ -109,7 +101,7 @@ var _ = Describe("Edit IDP",
Expect(textData).Should(ContainSubstring("Identity Provider '%s' has been created", idpName))

By("Create admin")
output, err = rosaSensitiveClient.User.CreateAdmin(clusterID)
output, err = rosaClient.User.CreateAdmin(clusterID)
Expect(err).To(BeNil())
textData = rosaClient.Parser.TextData.Input(output).Parse().Tip()
Expect(textData).Should(ContainSubstring("Admin account has been added"))
Expand All @@ -122,7 +114,7 @@ var _ = Describe("Edit IDP",
output, err = rosaClient.User.DescribeAdmin(clusterID)
Expect(err).To(BeNil())
textData = rosaClient.Parser.TextData.Input(output).Parse().Tip()
Expect(textData).Should(ContainSubstring("There is an admin on cluster"))
Expect(textData).Should(ContainSubstring("There is 'cluster-admin' user on cluster"))

By("List IDP")
idpTab, _, err = idpService.ListIDP(clusterID)
Expand All @@ -132,15 +124,13 @@ var _ = Describe("Edit IDP",

By("login the cluster with the created cluster admin")
time.Sleep(3 * time.Minute)
stdout, err := rosaSensitiveClient.Runner.RunCMD(strings.Split(command, " "))
stdout, err := rosaClient.Runner.RunCMD(strings.Split(command, " "))
Expect(err).To(BeNil())
Expect(stdout.String()).Should(ContainSubstring("Login successful"))
})

It("can create/List/Delete IDPs for rosa clusters - [id:35896]",
labels.Critical,
labels.MigrationToVerify,
labels.Exclude,
func() {
// common IDP variables
var (
Expand Down Expand Up @@ -170,7 +160,7 @@ var _ = Describe("Edit IDP",
idp := make(map[string]theIDP)
idp["Github"] = theIDP{
name: "mygithub",
url: "https://hn.com",
url: "testhub.com",
org: "myorg",
}
idp["LDAP"] = theIDP{
Expand Down Expand Up @@ -276,8 +266,6 @@ var _ = Describe("Edit IDP",

It("can create/delete the HTPasswd IDPs - [id:49137]",
labels.Critical,
labels.MigrationToVerify,
labels.Exclude,
func() {
var (
idpType = "htpasswd"
Expand All @@ -288,36 +276,36 @@ var _ = Describe("Edit IDP",
)

By("Create admin")
output, err := rosaSensitiveClient.User.CreateAdmin(clusterID)
output, err := rosaClient.User.CreateAdmin(clusterID)
Expect(err).To(BeNil())
textData := rosaSensitiveClient.Parser.TextData.Input(output).Parse().Tip()
textData := rosaClient.Parser.TextData.Input(output).Parse().Tip()
Expect(textData).Should(ContainSubstring("Admin account has been added"))

By("Create one htpasswd idp with multiple users")
_, singleUserName, singleUserPasswd, err = common.GenerateHtpasswdPair("user1", "pass1")
Expect(err).To(BeNil())
output, err = idpServiceSensitive.CreateIDP(
output, err = idpService.CreateIDP(
clusterID, idpNames[0],
"--type", idpType,
"--username", singleUserName,
"--password", singleUserPasswd,
"-y")
Expect(err).To(BeNil())
textData = rosaSensitiveClient.Parser.TextData.Input(output).Parse().Tip()
textData = rosaClient.Parser.TextData.Input(output).Parse().Tip()
Expect(textData).Should(ContainSubstring("Identity Provider '%s' has been created", idpNames[0]))
Expect(textData).Should(ContainSubstring("To log in to the console, open"))
Expect(textData).Should(ContainSubstring("and click on '%s'", idpNames[0]))

By("Create one htpasswd idp with single users")
multipleuserPasswd, err = common.GenerateMultipleHtpasswdPairs(2)
Expect(err).To(BeNil())
output, err = idpServiceSensitive.CreateIDP(
output, err = idpService.CreateIDP(
clusterID, idpNames[1],
"--type", idpType,
"--users", strings.Join(multipleuserPasswd, ","),
"-y")
Expect(err).To(BeNil())
textData = rosaSensitiveClient.Parser.TextData.Input(output).Parse().Tip()
textData = rosaClient.Parser.TextData.Input(output).Parse().Tip()
Expect(textData).Should(ContainSubstring("Identity Provider '%s' has been created", idpNames[1]))
Expect(textData).Should(ContainSubstring("To log in to the console, open"))
Expect(textData).Should(ContainSubstring("and click on '%s'", idpNames[1]))
Expand All @@ -328,13 +316,13 @@ var _ = Describe("Edit IDP",
location, err := common.CreateTempFileWithPrefixAndContent("htpasswdfile", strings.Join(multipleuserPasswd, "\n"))
Expect(err).To(BeNil())
defer os.RemoveAll(location)
output, err = idpServiceSensitive.CreateIDP(
output, err = idpService.CreateIDP(
clusterID, idpNames[2],
"--type", idpType,
"--from-file", location,
"-y")
Expect(err).To(BeNil())
textData = rosaSensitiveClient.Parser.TextData.Input(output).Parse().Tip()
textData = rosaClient.Parser.TextData.Input(output).Parse().Tip()
Expect(textData).Should(ContainSubstring("Identity Provider '%s' has been created", idpNames[2]))
Expect(textData).Should(ContainSubstring("To log in to the console, open"))
Expect(textData).Should(ContainSubstring("and click on '%s'", idpNames[2]))
Expand Down
17 changes: 9 additions & 8 deletions tests/e2e/test_rosacli_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ var _ = Describe("Edit User",

It("can grant/list/revoke users - [id:36128]",
labels.Critical,
labels.MigrationToVerify,
labels.Exclude,
func() {
var (
dedicatedAdminsGroupName = "dedicated-admins"
Expand Down Expand Up @@ -103,9 +101,10 @@ var _ = Describe("Edit User",
textData = rosaClient.Parser.TextData.Input(out).Parse().Tip()
Expect(textData).Should(ContainSubstring("Revoked role '%s' from user '%s' on cluster '%s'", clusterAdminsGroupName, clusterAdminsUserName, clusterID))

By("List users")
By("List users after revoke")
usersList, _, err = userService.ListUsers(clusterID)
Expect(err).ToNot(HaveOccurred())
// Comment this part due to known issue
// Expect(err).ToNot(HaveOccurred())

foundUser, err := usersList.User(dedicatedAdminsUserName)
Expect(err).ToNot(HaveOccurred())
Expand Down Expand Up @@ -143,8 +142,6 @@ var _ = Describe("Validate user",

It("try to create cluster with invalid usernames, passwords or unsupported configurations - [id:66362]",
labels.Critical,
labels.MigrationToVerify,
labels.Exclude,
func() {
clusterID = "fake-cluster" // these tests do not create or use a real cluster so no need to address an existing one.

Expand All @@ -163,8 +160,12 @@ var _ = Describe("Validate user",
Expect(textData).Should(ContainSubstring("assword must be at least"))

By("Try to create Hypershift cluster with admin username and password set (unsupported)")
output, err = clusterService.CreateDryRun(clusterID, "--hosted-cp", "--cluster-admin-password", validPassword,
"--region", "us-west-2", "--support-role-arn", "--controlplane-iam-role", "--worker-iam-role",
output, err = clusterService.CreateDryRun(clusterID, "--hosted-cp",
"--cluster-admin-password", validPassword,
"--region", "us-west-2",
"--support-role-arn", "fake",
"--controlplane-iam-role", "fake",
"--worker-iam-role", "fake",
"--mode", "auto", "-y")
textData = rosaClient.Parser.TextData.Input(output).Parse().Tip()
Expect(err).To(HaveOccurred())
Expand Down
8 changes: 7 additions & 1 deletion tests/utils/log/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,17 @@ import (
)

const (
RedactValue = "XXXXXXXX"
RedactValue = "*************"
)

var RedactKeyList = []*regexp.Regexp{
regexp.MustCompile(`(\\?"password\\?":\\?")([^"]*)(\\?")`),
regexp.MustCompile(`(\\?"additional_trust_bundle\\?":\\?")([^"]*)(\\?")`),
regexp.MustCompile(`(-----BEGIN CERTIFICATE-----\n)([^-----]*)(-----END CERTIFICATE-----)`),
regexp.MustCompile(`(--password\s+)([^\n\t\\\s]+)([\n\\\s]*)`),
regexp.MustCompile(`(--client-id\s+)([^\n\t\\\s]+)([\n\\\s]*)`),
regexp.MustCompile(`(--bind-password\s+)([^\n\t\\\s]+)([\n\\\s]*)`),
regexp.MustCompile(`(--client-secret\s+)([^\n\t\\\s]+)([\n\\\s]*)`),
regexp.MustCompile(`(--users\s+[a-zA-Z0-9-]+:)([^\s\n\\]+)([\s\S]+)`),
regexp.MustCompile(`(--cluster-admin-password\s+)([^\n\t\\\s]+)([\n\\\s]*)`),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a reminder that we also need to mask the AWS billing account in the future.

}
2 changes: 1 addition & 1 deletion tests/utils/log/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func (l *Log) Redact(fmtedString string) string {
for _, regexP := range RedactKeyList {
if l.NeedRedact(fmtedString, regexP) {
l.logger.Debugf("Got need redacted string from log match regex %s", regexP.String())
fmtedString = regexP.ReplaceAllString(fmtedString, fmt.Sprintf(`$1"%s$3`, RedactValue))
fmtedString = regexP.ReplaceAllString(fmtedString, fmt.Sprintf(`$1%s$3`, RedactValue))
}
}
return fmtedString
Expand Down