Skip to content

Commit

Permalink
feat: increment greenhouse chart version, fix linter suggestion
Browse files Browse the repository at this point in the history
  • Loading branch information
k.zagorski committed Sep 6, 2024
1 parent 776fea9 commit 4310c90
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion charts/greenhouse/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ apiVersion: v2
name: greenhouse
description: A Helm chart for deploying greenhouse
type: application
version: 0.2.5
version: 0.2.6
appVersion: "0.1.0"

dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ var _ = Describe("TeammembershipUpdaterController", func() {
createTeamMembershipForFirstTeam(nil)

By("creating a test Team")
createTeam(firstTeamName, validIdpGroupName)
createFirstTeam(validIdpGroupName)

By("ensuring the TeamMembership has been reconciled")
Eventually(func(g Gomega) {
Expand Down Expand Up @@ -109,7 +109,7 @@ var _ = Describe("TeammembershipUpdaterController", func() {
})

By("creating a test Team")
createTeam(firstTeamName, validIdpGroupName)
createFirstTeam(validIdpGroupName)

By("ensuring the TeamMembership has been reconciled")
Eventually(func(g Gomega) {
Expand All @@ -134,7 +134,7 @@ var _ = Describe("TeammembershipUpdaterController", func() {
})

By("creating first test Team")
firstTeam := createTeam(firstTeamName, validIdpGroupName)
firstTeam := createFirstTeam(validIdpGroupName)

By("creating second test Team")
secondTeam := setup.CreateTeam(test.Ctx, secondTeamName, test.WithMappedIDPGroup(otherValidIdpGroupName))
Expand Down Expand Up @@ -195,7 +195,7 @@ var _ = Describe("TeammembershipUpdaterController", func() {
createTeamMembershipForFirstTeam(nil)

By("creating a test Team without mappedIdpGroup")
createTeam(firstTeamName, "")
createFirstTeam("")

By("ensuring the TeamMembership has been deleted")
Eventually(func(g Gomega) {
Expand Down Expand Up @@ -270,7 +270,7 @@ var _ = Describe("TeammembershipUpdaterController", func() {
createTeamMembershipForFirstTeam(nil)

By("creating a test Team with valid MappedIdpGroup")
createTeam(firstTeamName, validIdpGroupName)
createFirstTeam(validIdpGroupName)

By("ensuring TeamMemberships have been reconciled")
Eventually(func(g Gomega) {
Expand Down Expand Up @@ -298,7 +298,7 @@ var _ = Describe("TeammembershipUpdaterController", func() {
createTeamMembershipForFirstTeam(nil)

By("creating a test Team with invalid MappedIdpGroup")
createTeam(firstTeamName, nonExistingGroupName)
createFirstTeam(nonExistingGroupName)

By("ensuring TeamMemberships have been reconciled")
Eventually(func(g Gomega) {
Expand Down Expand Up @@ -366,7 +366,7 @@ var _ = Describe("TeammembershipUpdaterController", func() {
createTeamMembershipForFirstTeam(originalUsers)

By("creating test Team with valid idp group")
createTeam(firstTeamName, validIdpGroupName)
createFirstTeam(validIdpGroupName)

expectedUser1 := greenhousev1alpha1.User{
ID: "I12345",
Expand Down Expand Up @@ -454,14 +454,14 @@ func createTeamMembershipForFirstTeam(members []greenhousev1alpha1.User) {
Expect(err).NotTo(HaveOccurred(), "there must be no error creating a TeamMembership")
}

func createTeam(name, mappedIDPGroup string) *greenhousev1alpha1.Team {
func createFirstTeam(mappedIDPGroup string) *greenhousev1alpha1.Team {
team := &greenhousev1alpha1.Team{
TypeMeta: metav1.TypeMeta{
Kind: "Team",
APIVersion: greenhousev1alpha1.GroupVersion.String(),
},
ObjectMeta: metav1.ObjectMeta{
Name: name,
Name: firstTeamName,
Namespace: setup.Namespace(),
},
Spec: greenhousev1alpha1.TeamSpec{
Expand Down

0 comments on commit 4310c90

Please sign in to comment.