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

make it compatible with CRC #349

Merged
merged 2 commits into from
Sep 23, 2023
Merged

make it compatible with CRC #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6883878
make it compatible with CRC
MatousJobanek Sep 22, 2023
c22a22f
tests
MatousJobanek Sep 22, 2023
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 pkg/signup/service/signup_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ func getRHODSMemberURL(signup signup.Signup) string {
// for example for the "devspaces" app and api server "https://api.host.openshiftapps.com:6443"
// it will return "https://devspaces.apps.host.openshiftapps.com"
func getAppsURL(appRouteName string, signup signup.Signup) string {
index := strings.Index(signup.ConsoleURL, ".apps.")
index := strings.Index(signup.ConsoleURL, ".apps")
if index == -1 {
return ""
}
Expand Down
195 changes: 100 additions & 95 deletions pkg/signup/service/signup_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,7 @@ func (s *TestSignupServiceSuite) TestGetSignupStatusNotComplete() {
err = s.FakeSpaceBindingClient.Tracker.Add(spacebinding)
require.NoError(s.T(), err)

toolchainStatus := s.newToolchainStatus()
toolchainStatus := s.newToolchainStatus(".apps.")
err = s.FakeToolchainStatusClient.Tracker.Add(toolchainStatus)
require.NoError(s.T(), err)

Expand Down Expand Up @@ -1135,106 +1135,111 @@ func (s *TestSignupServiceSuite) TestGetSignupDeactivated() {

func (s *TestSignupServiceSuite) TestGetSignupStatusOK() {
// given
s.ServiceConfiguration(configuration.Namespace(), true, "", 5)

us := s.newUserSignupComplete()
err := s.FakeUserSignupClient.Tracker.Add(us)
require.NoError(s.T(), err)

mur := s.newProvisionedMUR("ted")
err = s.FakeMasterUserRecordClient.Tracker.Add(mur)
require.NoError(s.T(), err)

c, _ := gin.CreateTestContext(httptest.NewRecorder())

toolchainStatus := s.newToolchainStatus()
err = s.FakeToolchainStatusClient.Tracker.Add(toolchainStatus)
require.NoError(s.T(), err)
for _, appsSubDomain := range []string{".apps.", ".apps-"} {
s.SetupTest()
s.T().Run("for apps subdomain: "+appsSubDomain, func(t *testing.T) {
s.ServiceConfiguration(configuration.Namespace(), true, "", 5)

space := s.newSpaceForMUR(mur.Name, us.Name)
err = s.FakeSpaceClient.Tracker.Add(space)
require.NoError(s.T(), err)
us := s.newUserSignupComplete()
err := s.FakeUserSignupClient.Tracker.Add(us)
require.NoError(s.T(), err)

spacebinding := s.newSpaceBinding(mur.Name, space.Name)
err = s.FakeSpaceBindingClient.Tracker.Add(spacebinding)
require.NoError(s.T(), err)
mur := s.newProvisionedMUR("ted")
err = s.FakeMasterUserRecordClient.Tracker.Add(mur)
require.NoError(s.T(), err)

// when
response, err := s.Application.SignupService().GetSignup(c, us.Name, "")
c, _ := gin.CreateTestContext(httptest.NewRecorder())

// then
require.NoError(s.T(), err)
require.NotNil(s.T(), response)
toolchainStatus := s.newToolchainStatus(appsSubDomain)
err = s.FakeToolchainStatusClient.Tracker.Add(toolchainStatus)
require.NoError(s.T(), err)

require.Equal(s.T(), us.Name, response.Name)
require.Equal(s.T(), "[email protected]", response.Username)
require.Equal(s.T(), "ted", response.CompliantUsername)
assert.True(s.T(), response.Status.Ready)
assert.Equal(s.T(), "mur_ready_reason", response.Status.Reason)
assert.Equal(s.T(), "mur_ready_message", response.Status.Message)
assert.False(s.T(), response.Status.VerificationRequired)
assert.Equal(s.T(), "https://console.apps.member-123.com", response.ConsoleURL)
assert.Equal(s.T(), "http://che-toolchain-che.member-123.com", response.CheDashboardURL)
assert.Equal(s.T(), "http://api.devcluster.openshift.com", response.APIEndpoint)
assert.Equal(s.T(), "member-123", response.ClusterName)
assert.Equal(s.T(), "https://proxy-url.com", response.ProxyURL)
assert.Equal(s.T(), "ted-dev", response.DefaultUserNamespace)
assert.Equal(s.T(), "https://rhods-dashboard-redhat-ods-applications.apps.member-123.com", response.RHODSMemberURL)
space := s.newSpaceForMUR(mur.Name, us.Name)
err = s.FakeSpaceClient.Tracker.Add(space)
require.NoError(s.T(), err)

s.T().Run("informer", func(t *testing.T) {
// given
inf := fake.NewFakeInformer()
inf.GetUserSignupFunc = func(name string) (*toolchainv1alpha1.UserSignup, error) {
if name == us.Name {
return us, nil
}
return nil, apierrors.NewNotFound(schema.GroupResource{}, name)
}
inf.GetMurFunc = func(name string) (*toolchainv1alpha1.MasterUserRecord, error) {
if name == mur.Name {
return mur, nil
}
return nil, apierrors.NewNotFound(schema.GroupResource{}, name)
}
inf.GetToolchainStatusFunc = func() (*toolchainv1alpha1.ToolchainStatus, error) {
return toolchainStatus, nil
}
inf.GetSpaceFunc = func(name string) (*toolchainv1alpha1.Space, error) {
return space, nil
}
inf.ListSpaceBindingFunc = func(reqs ...labels.Requirement) ([]toolchainv1alpha1.SpaceBinding, error) {
return []toolchainv1alpha1.SpaceBinding{*spacebinding}, nil
}
spacebinding := s.newSpaceBinding(mur.Name, space.Name)
err = s.FakeSpaceBindingClient.Tracker.Add(spacebinding)
require.NoError(s.T(), err)

s.Application.MockInformerService(inf)
svc := service.NewSignupService(
fake.MemberClusterServiceContext{
Client: s,
Svcs: s.Application,
},
)
// when
response, err := s.Application.SignupService().GetSignup(c, us.Name, "")

// when
response, err := svc.GetSignupFromInformer(c, us.Name, "", true)
// then
require.NoError(s.T(), err)
require.NotNil(s.T(), response)

// then
require.NoError(s.T(), err)
require.NotNil(s.T(), response)
require.Equal(s.T(), us.Name, response.Name)
require.Equal(s.T(), "[email protected]", response.Username)
require.Equal(s.T(), "ted", response.CompliantUsername)
assert.True(s.T(), response.Status.Ready)
assert.Equal(s.T(), "mur_ready_reason", response.Status.Reason)
assert.Equal(s.T(), "mur_ready_message", response.Status.Message)
assert.False(s.T(), response.Status.VerificationRequired)
assert.Equal(s.T(), fmt.Sprintf("https://console%smember-123.com", appsSubDomain), response.ConsoleURL)
assert.Equal(s.T(), "http://che-toolchain-che.member-123.com", response.CheDashboardURL)
assert.Equal(s.T(), "http://api.devcluster.openshift.com", response.APIEndpoint)
assert.Equal(s.T(), "member-123", response.ClusterName)
assert.Equal(s.T(), "https://proxy-url.com", response.ProxyURL)
assert.Equal(s.T(), "ted-dev", response.DefaultUserNamespace)
assert.Equal(s.T(), fmt.Sprintf("https://rhods-dashboard-redhat-ods-applications%smember-123.com", appsSubDomain), response.RHODSMemberURL)

s.T().Run("informer", func(t *testing.T) {
// given
inf := fake.NewFakeInformer()
inf.GetUserSignupFunc = func(name string) (*toolchainv1alpha1.UserSignup, error) {
if name == us.Name {
return us, nil
}
return nil, apierrors.NewNotFound(schema.GroupResource{}, name)
}
inf.GetMurFunc = func(name string) (*toolchainv1alpha1.MasterUserRecord, error) {
if name == mur.Name {
return mur, nil
}
return nil, apierrors.NewNotFound(schema.GroupResource{}, name)
}
inf.GetToolchainStatusFunc = func() (*toolchainv1alpha1.ToolchainStatus, error) {
return toolchainStatus, nil
}
inf.GetSpaceFunc = func(name string) (*toolchainv1alpha1.Space, error) {
return space, nil
}
inf.ListSpaceBindingFunc = func(reqs ...labels.Requirement) ([]toolchainv1alpha1.SpaceBinding, error) {
return []toolchainv1alpha1.SpaceBinding{*spacebinding}, nil
}

require.Equal(s.T(), "[email protected]", response.Username)
require.Equal(s.T(), "ted", response.CompliantUsername)
assert.True(s.T(), response.Status.Ready)
assert.Equal(s.T(), "mur_ready_reason", response.Status.Reason)
assert.Equal(s.T(), "mur_ready_message", response.Status.Message)
assert.False(s.T(), response.Status.VerificationRequired)
assert.Equal(s.T(), "https://console.apps.member-123.com", response.ConsoleURL)
assert.Equal(s.T(), "http://che-toolchain-che.member-123.com", response.CheDashboardURL)
assert.Equal(s.T(), "http://api.devcluster.openshift.com", response.APIEndpoint)
assert.Equal(s.T(), "member-123", response.ClusterName)
assert.Equal(s.T(), "https://proxy-url.com", response.ProxyURL)
assert.Equal(s.T(), "ted-dev", response.DefaultUserNamespace)
assert.Equal(s.T(), "https://rhods-dashboard-redhat-ods-applications.apps.member-123.com", response.RHODSMemberURL)
})
s.Application.MockInformerService(inf)
svc := service.NewSignupService(
fake.MemberClusterServiceContext{
Client: s,
Svcs: s.Application,
},
)

// when
response, err := svc.GetSignupFromInformer(c, us.Name, "", true)

// then
require.NoError(s.T(), err)
require.NotNil(s.T(), response)

require.Equal(s.T(), "[email protected]", response.Username)
require.Equal(s.T(), "ted", response.CompliantUsername)
assert.True(s.T(), response.Status.Ready)
assert.Equal(s.T(), "mur_ready_reason", response.Status.Reason)
assert.Equal(s.T(), "mur_ready_message", response.Status.Message)
assert.False(s.T(), response.Status.VerificationRequired)
assert.Equal(s.T(), fmt.Sprintf("https://console%smember-123.com", appsSubDomain), response.ConsoleURL)
assert.Equal(s.T(), "http://che-toolchain-che.member-123.com", response.CheDashboardURL)
assert.Equal(s.T(), "http://api.devcluster.openshift.com", response.APIEndpoint)
assert.Equal(s.T(), "member-123", response.ClusterName)
assert.Equal(s.T(), "https://proxy-url.com", response.ProxyURL)
assert.Equal(s.T(), "ted-dev", response.DefaultUserNamespace)
assert.Equal(s.T(), fmt.Sprintf("https://rhods-dashboard-redhat-ods-applications%smember-123.com", appsSubDomain), response.RHODSMemberURL)
})
})
}
}

func (s *TestSignupServiceSuite) TestGetSignupByUsernameOK() {
Expand All @@ -1260,7 +1265,7 @@ func (s *TestSignupServiceSuite) TestGetSignupByUsernameOK() {
err = s.FakeSpaceBindingClient.Tracker.Add(spacebinding)
require.NoError(s.T(), err)

toolchainStatus := s.newToolchainStatus()
toolchainStatus := s.newToolchainStatus(".apps.")
err = s.FakeToolchainStatusClient.Tracker.Add(toolchainStatus)
require.NoError(s.T(), err)

Expand Down Expand Up @@ -1343,7 +1348,7 @@ func (s *TestSignupServiceSuite) TestGetSignupByUsernameOK() {
})
}

func (s *TestSignupServiceSuite) newToolchainStatus() *toolchainv1alpha1.ToolchainStatus {
func (s *TestSignupServiceSuite) newToolchainStatus(appsSubDomain string) *toolchainv1alpha1.ToolchainStatus {
toolchainStatus := &toolchainv1alpha1.ToolchainStatus{
TypeMeta: v1.TypeMeta{},
ObjectMeta: v1.ObjectMeta{
Expand All @@ -1357,7 +1362,7 @@ func (s *TestSignupServiceSuite) newToolchainStatus() *toolchainv1alpha1.Toolcha
APIEndpoint: "http://api.devcluster.openshift.com",
MemberStatus: toolchainv1alpha1.MemberStatusStatus{
Routes: &toolchainv1alpha1.Routes{
ConsoleURL: "https://console.apps.member-1.com",
ConsoleURL: fmt.Sprintf("https://console%smember-1.com", appsSubDomain),
CheDashboardURL: "http://che-toolchain-che.member-1.com",
},
},
Expand All @@ -1367,7 +1372,7 @@ func (s *TestSignupServiceSuite) newToolchainStatus() *toolchainv1alpha1.Toolcha
APIEndpoint: "http://api.devcluster.openshift.com",
MemberStatus: toolchainv1alpha1.MemberStatusStatus{
Routes: &toolchainv1alpha1.Routes{
ConsoleURL: "https://console.apps.member-123.com",
ConsoleURL: fmt.Sprintf("https://console%smember-123.com", appsSubDomain),
CheDashboardURL: "http://che-toolchain-che.member-123.com",
},
},
Expand Down
Loading