From 6bf781e9476ec33515a5dbe0f5a73ee364262b78 Mon Sep 17 00:00:00 2001 From: alexey Date: Tue, 28 Mar 2023 17:12:25 +0100 Subject: [PATCH 1/2] fix happy path test --- pkg/integration/integration_test.go | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/pkg/integration/integration_test.go b/pkg/integration/integration_test.go index 340f28f5d..cae5ac59f 100644 --- a/pkg/integration/integration_test.go +++ b/pkg/integration/integration_test.go @@ -346,24 +346,6 @@ func TestHappyPath(t *testing.T) { lock, err := utils.GetLock() assert.NoError(t, err) assert.NotNil(t, lock, "failed to create lock") - /* - sess, err := session.NewSessionWithOptions(session.Options{ - Profile: "digger-test", - Config: awssdk.Config{ - Region: awssdk.String("us-east-1"), - }, - }) - - svc := sts.New(sess) - input := &sts.GetCallerIdentityInput{} - - result, err := svc.GetCallerIdentity(input) - assert.NotEmpty(t, *result.Account) - - assert.NoError(t, err) - dynamoDb := dynamodb.New(sess) - dynamoDbLock := aws.DynamoDbLock{DynamoDb: dynamoDb} - */ ghToken := os.Getenv("GITHUB_TOKEN") assert.NotEmpty(t, ghToken) @@ -393,7 +375,7 @@ func TestHappyPath(t *testing.T) { assert.Equal(t, "pull_request", parsedNewPullRequestContext.EventName) - // new pr should lock the project + // new pr doesn't lock the project by default impactedProjects, prNumber, err := digger.ProcessGitHubEvent(ghEvent, diggerConfig, githubPrService) assert.NoError(t, err) commandsToRunPerProject, err := digger.ConvertGithubEventToCommands(ghEvent, impactedProjects) @@ -410,7 +392,7 @@ func TestHappyPath(t *testing.T) { resource := repositoryName + "#default" transactionId, err := projectLock.InternalLock.GetLock(resource) assert.NoError(t, err) - assert.Equal(t, 11, *transactionId, "TransactionId") + assert.Nil(t, transactionId) println("--- digger plan comment ---") ghEvent = parsedDiggerPlanCommentContext.Event From 14f7e425f36409f945e6d726b4d542e5dec17298 Mon Sep 17 00:00:00 2001 From: alexey Date: Tue, 28 Mar 2023 17:25:02 +0100 Subject: [PATCH 2/2] fix happy path test --- pkg/integration/integration_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/integration/integration_test.go b/pkg/integration/integration_test.go index cae5ac59f..253bf9571 100644 --- a/pkg/integration/integration_test.go +++ b/pkg/integration/integration_test.go @@ -375,7 +375,7 @@ func TestHappyPath(t *testing.T) { assert.Equal(t, "pull_request", parsedNewPullRequestContext.EventName) - // new pr doesn't lock the project by default + // new pr should lock the project impactedProjects, prNumber, err := digger.ProcessGitHubEvent(ghEvent, diggerConfig, githubPrService) assert.NoError(t, err) commandsToRunPerProject, err := digger.ConvertGithubEventToCommands(ghEvent, impactedProjects) @@ -389,10 +389,11 @@ func TestHappyPath(t *testing.T) { ProjectName: "dev", RepoName: repositoryName, } - resource := repositoryName + "#default" + resource := repositoryName + "#" + projectLock.ProjectName transactionId, err := projectLock.InternalLock.GetLock(resource) assert.NoError(t, err) - assert.Nil(t, transactionId) + assert.NotNil(t, transactionId) + assert.Equal(t, 11, *transactionId, "TransactionId") println("--- digger plan comment ---") ghEvent = parsedDiggerPlanCommentContext.Event