Skip to content

Commit

Permalink
Merge pull request #34 from stakater/update-tests
Browse files Browse the repository at this point in the history
Remove remnent resources after tests
  • Loading branch information
ahmedwaleedmalik authored Jan 6, 2021
2 parents 807a7a1 + fa1e129 commit caa4ba0
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 7 deletions.
3 changes: 3 additions & 0 deletions controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ var _ = BeforeSuite(func(done Done) {
}, 60)

var _ = AfterSuite(func() {
// Remove remnent resources
util.DeleteAllSlackChannels(ns)

By("tearing down the test environment")
err := testEnv.Stop()
Expect(err).ToNot(HaveOccurred())
Expand Down
48 changes: 41 additions & 7 deletions controllers/util/testUtil.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ package util

import (
"context"
"fmt"
"math/rand"
"time"

ginko "github.com/onsi/ginkgo"
ginkgo "github.com/onsi/ginkgo"
slackv1alpha1 "github.com/stakater/slack-operator/api/v1alpha1"
mockdata "github.com/stakater/slack-operator/pkg/slack/mock"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -35,14 +37,14 @@ func (t *TestUtil) CreateChannel(name string, isPrivate bool, topic string, desc
err := t.k8sClient.Create(t.ctx, channelObject)

if err != nil {
ginko.Fail(err.Error())
ginkgo.Fail(err.Error())
}

req := reconcile.Request{NamespacedName: types.NamespacedName{Name: name, Namespace: namespace}}

_, err = t.r.Reconcile(req)
if err != nil {
ginko.Fail(err.Error())
ginkgo.Fail(err.Error())
}

return channelObject
Expand All @@ -54,7 +56,7 @@ func (t *TestUtil) GetChannel(name string, namespace string) *slackv1alpha1.Chan
err := t.k8sClient.Get(t.ctx, types.NamespacedName{Name: name, Namespace: namespace}, channelObject)

if err != nil {
ginko.Fail(err.Error())
ginkgo.Fail(err.Error())
}

return channelObject
Expand All @@ -66,20 +68,20 @@ func (t *TestUtil) DeleteChannel(name string, namespace string) {
err := t.k8sClient.Get(t.ctx, types.NamespacedName{Name: name, Namespace: namespace}, channelObject)

if err != nil {
ginko.Fail(err.Error())
ginkgo.Fail(err.Error())
}

err = t.k8sClient.Delete(t.ctx, channelObject)

if err != nil {
ginko.Fail(err.Error())
ginkgo.Fail(err.Error())
}

req := reconcile.Request{NamespacedName: types.NamespacedName{Name: name, Namespace: namespace}}

_, err = t.r.Reconcile(req)
if err != nil {
ginko.Fail(err.Error())
ginkgo.Fail(err.Error())
}
}

Expand All @@ -92,6 +94,38 @@ func (t *TestUtil) TryDeleteChannel(name string, namespace string) {
_, _ = t.r.Reconcile(req)
}

// DeleteAllSlackChannels delete all the slack channels in the namespace
func (t *TestUtil) DeleteAllSlackChannels(namespace string) {
// Specify namespace in list Options
listOptions := &client.ListOptions{Namespace: namespace}

// List channels in a specified namespace
channelList := &slackv1alpha1.ChannelList{}
err := t.k8sClient.List(context.TODO(), channelList, listOptions)
if err != nil {
ginkgo.Fail(err.Error())
}

for _, channel := range channelList.Items {
channel.Finalizers = []string{}

err := t.k8sClient.Update(t.ctx, &channel)
if err != nil {
if err.Error() == fmt.Sprintf(mockdata.ChannelObjectModifiedError, channel.Name) {
currentChannel := t.GetChannel(channel.Name, namespace)
currentChannel.Finalizers = []string{}
if err != nil {
ginkgo.Fail(err.Error())
}
} else {
ginkgo.Fail(err.Error())
}
}

t.TryDeleteChannel(channel.Name, namespace)
}
}

// CreateSlackChannelObject creates a slack channel custom resource object
func (t *TestUtil) CreateSlackChannelObject(name string, isPrivate bool, topic string, description string, users []string, namespace string) *slackv1alpha1.Channel {
return &slackv1alpha1.Channel{
Expand Down
2 changes: 2 additions & 0 deletions pkg/slack/mock/data.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (
"github.com/slack-go/slack"
)

var ChannelObjectModifiedError = "Operation cannot be fulfilled on channels.slack.stakater.com \"%s\": the object has been modified; please apply your changes to the latest version and try again"

var ConversationName = "bat-channel"
var NameTakenConversationName = "name-taken"
var PublicConversationID = "C0EAQDV4Z"
Expand Down

0 comments on commit caa4ba0

Please sign in to comment.