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

[Draft] OCM-8721 | ci: Tunning the framework for the OCMResource service to use the action methods #2163

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Draft] OCM-8721 | ci: Tunning the framework for the OCMResource service to use the action methods #2163

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/e2e/dummy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ var _ = Describe("ROSA CLI Test", func() {
Describe("logstreamtest", func() {
It("", func() {
funcA := func(causeError bool) error {
rosacli.NewClient().OCMResource.ListRegion()
rosacli.NewClient().OCMResource.List().Regions().Run()
Logger.Debugf("I am debug message with caseuError %v", causeError)
if causeError {
return fmt.Errorf("test")
Expand Down
71 changes: 42 additions & 29 deletions tests/e2e/hcp_external_auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ var _ = Describe("External auth provider", labels.Feature.ExternalAuthProvider,
var err error
var userName string
var breakGlassCredID string
breakGlassCredentialService := rosaClient.BreakGlassCredential

userNameList := []string{}

Expand All @@ -70,18 +71,18 @@ var _ = Describe("External auth provider", labels.Feature.ExternalAuthProvider,
}

By("Retrieve help for create/list/describe/delete break-glass-credential")
_, err = rosaClient.BreakGlassCredential.RetrieveHelpForCreate()
_, err = breakGlassCredentialService.Create().Help().Run()
Expect(err).ToNot(HaveOccurred())
_, err = rosaClient.BreakGlassCredential.RetrieveHelpForDescribe()
_, err = breakGlassCredentialService.Describe().Help().Run()
Expect(err).ToNot(HaveOccurred())
_, err = rosaClient.BreakGlassCredential.RetrieveHelpForList()
_, err = breakGlassCredentialService.List().Help().Run()
Expect(err).ToNot(HaveOccurred())
_, err = rosaClient.BreakGlassCredential.RetrieveHelpForDelete()
_, err = breakGlassCredentialService.Revoke().Help().Run()
Expect(err).ToNot(HaveOccurred())

for key, value := range reqBody {
By("Create a break-glass-credential to the cluster")
resp, err = rosaClient.BreakGlassCredential.CreateBreakGlassCredential(clusterID, value...)
resp, err = breakGlassCredentialService.Create().Parameters(clusterID, value...).Run()
createTime := time.Now().UTC()
expiredTime := createTime.Add(15 * time.Minute).Format("Jan _2 2006 15:04 MST")
if key == "emptyExpiration" || key == "empty" {
Expand All @@ -92,42 +93,47 @@ var _ = Describe("External auth provider", labels.Feature.ExternalAuthProvider,
Expect(textData).To(ContainSubstring("INFO: Successfully created a break glass credential for cluster '%s'", clusterID))

By("List the break-glass-credentials of the cluster")
breakGlassCredList, err := rosaClient.BreakGlassCredential.ListBreakGlassCredentialsAndReflect(clusterID)
breakGlassCredList, err := breakGlassCredentialService.List().Parameters(clusterID).ToStruct()
Expect(err).ToNot(HaveOccurred())
for _, breabreakGlassCred := range breakGlassCredList.BreakGlassCredentials {
for _, breabreakGlassCred := range breakGlassCredList.(rosacli.BreakGlassCredentialList) {
if !slices.Contains(userNameList, breabreakGlassCred.Username) && breabreakGlassCred.Status != "revoked" && breabreakGlassCred.Status != "awaiting_revocation" {
userName = breabreakGlassCred.Username
breakGlassCredID = breabreakGlassCred.ID
userNameList = append(userNameList, userName)
Eventually(rosaClient.BreakGlassCredential.WaitForBreakGlassCredentialToStatus(clusterID, "issued", userName), time.Minute*2, time.Second*10).Should(BeTrue())
Eventually(breakGlassCredentialService.WaitForStatus(clusterID, "issued", userName), time.Minute*2, time.Second*10).Should(BeTrue())
}
}

By("Describe the break-glass-credential")
output, err := rosaClient.BreakGlassCredential.DescribeBreakGlassCredentialsAndReflect(clusterID, breakGlassCredID)
output, err := breakGlassCredentialService.Describe(breakGlassCredID).Parameters(clusterID).ToStruct()
Expect(err).ToNot(HaveOccurred())
bgcDescription := output.(*rosacli.BreakGlassCredentialDescription)
// expiration timestamp changes from 4 to 5 seconds ahead, so have to remove second from time stamp
expirationTime, err := time.Parse("Jan _2 2006 15:04:05 MST", output.ExpireAt)
expirationTime, err := time.Parse("Jan _2 2006 15:04:05 MST", bgcDescription.ExpireAt)
Expect(err).ToNot(HaveOccurred())
Expect(output.ID).To(Equal(breakGlassCredID))
Expect(bgcDescription.ID).To(Equal(breakGlassCredID))
Expect(expirationTime.Format("Jan _2 2006 15:04 MST")).To(Equal(expiredTime))
Expect(output.Username).To(Equal(userName))
Expect(output.Status).To(Equal("issued"))
Expect(bgcDescription.Username).To(Equal(userName))
Expect(bgcDescription.Status).To(Equal("issued"))

By("Get the issued credential")
_, err = rosaClient.BreakGlassCredential.GetIssuedCredential(clusterID, breakGlassCredID)
_, err = breakGlassCredentialService.Describe(breakGlassCredID).Parameters(
clusterID,
"--id", breakGlassCredID,
"--kubeconfig",
).Run()
Expect(err).ToNot(HaveOccurred())
}

By("Delete the break-glass-credential")
resp, err = rosaClient.BreakGlassCredential.DeleteBreakGlassCredential(clusterID)
resp, err = breakGlassCredentialService.Revoke().Parameters(clusterID).Run()
Expect(err).ToNot(HaveOccurred())
textData := rosaClient.Parser.TextData.Input(resp).Parse().Tip()
Expect(textData).To(ContainSubstring("INFO: Successfully requested revocation for all break glass credentials from cluster '%s'", clusterID))

By("Check the break-glass-credential status is revoked")
for _, userName = range userNameList {
Eventually(rosaClient.BreakGlassCredential.WaitForBreakGlassCredentialToStatus(clusterID, "revoked", userName), time.Minute*4, time.Second*10).Should(BeTrue())
Eventually(breakGlassCredentialService.WaitForStatus(clusterID, "revoked", userName), time.Minute*4, time.Second*10).Should(BeTrue())
}
})

Expand Down Expand Up @@ -229,23 +235,26 @@ var _ = Describe("External auth provider", labels.Feature.ExternalAuthProvider,
hosted, err := clusterService.IsHostedCPCluster(clusterID)
Expect(err).ToNot(HaveOccurred())

breakGlassCredentialService := rosaClient.BreakGlassCredential
if !hosted {
By("Create a break-glass-credential to the cluster")
userName := common.GenerateRandomName("bgc-user-classic", 2)

resp, err := rosaClient.BreakGlassCredential.CreateBreakGlassCredential(clusterID, "--username", userName, "--expiration", "2h")
resp, err := breakGlassCredentialService.Create().Parameters(
clusterID, "--username", userName, "--expiration", "2h",
).Run()
Expect(err).To(HaveOccurred())
textData := rosaClient.Parser.TextData.Input(resp).Parse().Tip()
Expect(textData).To(ContainSubstring("ERR: external authentication provider is only supported for Hosted Control Planes"))

By("List the break-glass-credentials of the cluster")
resp, err = rosaClient.BreakGlassCredential.ListBreakGlassCredentials(clusterID)
resp, err = breakGlassCredentialService.List().Parameters(clusterID).Run()
Expect(err).To(HaveOccurred())
textData = rosaClient.Parser.TextData.Input(resp).Parse().Tip()
Expect(textData).To(ContainSubstring("ERR: external authentication provider is only supported for Hosted Control Planes"))

By("Revoke the break-glass-credentials of the cluster")
resp, err = rosaClient.BreakGlassCredential.DeleteBreakGlassCredential(clusterID)
resp, err = breakGlassCredentialService.Revoke().Parameters(clusterID).Run()
Expect(err).To(HaveOccurred())
textData = rosaClient.Parser.TextData.Input(resp).Parse().Tip()
Expect(textData).To(ContainSubstring("ERR: external authentication provider is only supported for Hosted Control Planes"))
Expand All @@ -259,46 +268,50 @@ var _ = Describe("External auth provider", labels.Feature.ExternalAuthProvider,
By("Create a break-glass-credential to the cluster")
userName := common.GenerateRandomName("bgc-user-non-external", 2)

resp, err := rosaClient.BreakGlassCredential.CreateBreakGlassCredential(clusterID, "--username", userName, "--expiration", "2h")
resp, err := breakGlassCredentialService.Create().Parameters(
clusterID, "--username", userName, "--expiration", "2h",
).Run()
Expect(err).To(HaveOccurred())
textData := rosaClient.Parser.TextData.Input(resp).Parse().Tip()
Expect(textData).To(ContainSubstring("ERR: External authentication configuration is not enabled for cluster '%s'", clusterID))

By("List the break-glass-credentials of the cluster")
resp, err = rosaClient.BreakGlassCredential.ListBreakGlassCredentials(clusterID)
resp, err = rosaClient.BreakGlassCredential.List().Parameters(clusterID).Run()
Expect(err).To(HaveOccurred())
textData = rosaClient.Parser.TextData.Input(resp).Parse().Tip()
Expect(textData).To(ContainSubstring("ERR: External authentication configuration is not enabled for cluster '%s'", clusterID))

By("Revoke the break-glass-credentials of the cluster")
resp, err = rosaClient.BreakGlassCredential.DeleteBreakGlassCredential(clusterID)
resp, err = rosaClient.BreakGlassCredential.Revoke().Parameters(clusterID).Run()
Expect(err).To(HaveOccurred())
textData = rosaClient.Parser.TextData.Input(resp).Parse().Tip()
Expect(textData).To(ContainSubstring("ERR: External authentication configuration is not enabled for cluster '%s'", clusterID))

} else if externalAuthProvider {

By("Create break-glass-credential with invalid --username")
userName := common.GenerateRandomName("bgc-user_", 2)

resp, err := rosaClient.BreakGlassCredential.CreateBreakGlassCredential(clusterID, "--username", userName, "--expiration", "2h")
resp, err := breakGlassCredentialService.Create().Parameters(
clusterID, "--username", userName, "--expiration", "2h",
).Run()
Expect(err).To(HaveOccurred())
textData := rosaClient.Parser.TextData.Input(resp).Parse().Tip()
Expect(textData).To(ContainSubstring("ERR: failed to create a break glass credential for cluster '%s': The username '%s' must respect the regexp '^[a-zA-Z0-9-.]*$'", clusterID, userName))

By("Create break-glass-credential with invalid --expiration")
userName = common.GenerateRandomName("bgc-user-invalid-exp", 2)
expirationTime := "2may"

resp, err = rosaClient.BreakGlassCredential.CreateBreakGlassCredential(clusterID, "--username", userName, "--expiration", expirationTime)
resp, err = breakGlassCredentialService.Create().Parameters(
clusterID, "--username", userName, "--expiration", expirationTime,
).Run()
Expect(err).To(HaveOccurred())
textData = rosaClient.Parser.TextData.Input(resp).Parse().Tip()
Expect(textData).To(ContainSubstring(`invalid argument "%s" for "--expiration" flag`, expirationTime))

By("Create break-glass-credential with invalid expiration")
userName = common.GenerateRandomName("bgc-user-exp-1s", 2)

resp, err = rosaClient.BreakGlassCredential.CreateBreakGlassCredential(clusterID, "--username", userName, "--expiration", "1s")
resp, err = breakGlassCredentialService.Create().Parameters(
clusterID, "--username", userName, "--expiration", "1s",
).Run()
Expect(err).To(HaveOccurred())
textData = rosaClient.Parser.TextData.Input(resp).Parse().Tip()
Expect(textData).To(ContainSubstring("ERR: failed to create a break glass credential for cluster '%s': Expiration needs to be at least 10 minutes from now", clusterID))
Expand Down
10 changes: 5 additions & 5 deletions tests/e2e/test_rosacli_region.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ var _ = Describe("Region",
func() {

By("List region")
usersTabNonH, _, err := ocmResourceService.ListRegion()
regionList, err := ocmResourceService.List().Regions().ToStruct()
Expect(err).To(BeNil())
Expect(len(usersTabNonH)).NotTo(Equal(0))
Expect(len(regionList.([]*rosacli.CloudRegion))).NotTo(Equal(0))

By("List region --hosted-cp")
usersTabH, _, err := ocmResourceService.ListRegion("--hosted-cp")
hcpRegionList, err := ocmResourceService.List().Regions().Parameters("--hosted-cp").ToStruct()
Expect(err).To(BeNil())
Expect(len(usersTabH)).NotTo(Equal(0))
Expect(len(hcpRegionList.([]*rosacli.CloudRegion))).NotTo(Equal(0))

By("Check out of 'rosa list region --hosted-cp' are supported for hosted-cp clusters")
for _, r := range usersTabH {
for _, r := range hcpRegionList.([]*rosacli.CloudRegion) {
Expect(r.MultiAZSupported).To(Equal("true"))
}
})
Expand Down
Loading