Skip to content

Commit

Permalink
Works with kosli-dev and user tore1
Browse files Browse the repository at this point in the history
  • Loading branch information
@ToreMerkely
ToreMerkely committed Oct 21, 2024
1 parent d555b62 commit 6bc0d29
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 45 deletions.
14 changes: 7 additions & 7 deletions cmd/kosli/assertPRBitbucket_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,21 @@ func (suite *AssertPRBitbucketCommandTestSuite) TestAssertPRBitbucketCmd() {
tests := []cmdTestCase{
{
name: "assert Bitbucket PR evidence passes when commit has a PR in bitbucket",
cmd: `assert pullrequest bitbucket --bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test
--commit 2492011ef04a9da09d35be706cf6a4c5bc6f1e69` + suite.defaultKosliArguments,
golden: "found [1] pull request(s) in Bitbucket for commit: 2492011ef04a9da09d35be706cf6a4c5bc6f1e69\n",
cmd: `assert pullrequest bitbucket --bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test
--commit fd54040fc90e7e83f7b152619bfa18917b72c34f` + suite.defaultKosliArguments,
golden: "found [1] pull request(s) in Bitbucket for commit: fd54040fc90e7e83f7b152619bfa18917b72c34f\n",
},
{
wantError: true,
name: "assert Bitbucket PR evidence fails when commit has no PRs in bitbucket",
cmd: `assert pullrequest bitbucket --bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test
--commit cb6ec5fcbb25b1ebe4859d35ab7995ab973f894c` + suite.defaultKosliArguments,
golden: "Error: assert failed: found no pull request(s) in Bitbucket for commit: cb6ec5fcbb25b1ebe4859d35ab7995ab973f894c\n",
cmd: `assert pullrequest bitbucket --bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test
--commit 3dce097040987c4693d2e4be817474d9d0063c93` + suite.defaultKosliArguments,
golden: "Error: assert failed: found no pull request(s) in Bitbucket for commit: 3dce097040987c4693d2e4be817474d9d0063c93\n",
},
{
wantError: true,
name: "assert Bitbucket PR evidence fails when commit does not exist",
cmd: `assert pullrequest bitbucket --bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test
cmd: `assert pullrequest bitbucket --bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test
--commit 19aab7f063147614451c88969602a10afba123ab` + suite.defaultKosliArguments,
golden: "Error: map[error:map[message:Resource not found] type:error]\n",
},
Expand Down
18 changes: 9 additions & 9 deletions cmd/kosli/attestPRBitbucket_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ func (suite *AttestBitbucketPRCommandTestSuite) SetupTest() {
var err error
suite.tmpDir, err = os.MkdirTemp("", "testDir")
require.NoError(suite.T(), err)
_, err = testHelpers.CloneGitRepo("https://bitbucket.org/ewelinawilkosz/cli-test.git", suite.tmpDir)
_, err = testHelpers.CloneGitRepo("https://bitbucket.org/kosli-dev/cli-test.git", suite.tmpDir)
require.NoError(suite.T(), err)

suite.defaultKosliArguments = fmt.Sprintf(" --flow %s --trail %s --repo-root %s --commit 2492011ef04a9da09d35be706cf6a4c5bc6f1e69 --host %s --org %s --api-token %s", suite.flowName, suite.trailName, suite.tmpDir, global.Host, global.Org, global.ApiToken)
suite.defaultKosliArguments = fmt.Sprintf(" --flow %s --trail %s --repo-root %s --commit fd54040fc90e7e83f7b152619bfa18917b72c34f --host %s --org %s --api-token %s", suite.flowName, suite.trailName, suite.tmpDir, global.Host, global.Org, global.ApiToken)
CreateFlowWithTemplate(suite.flowName, "testdata/valid_template.yml", suite.T())
BeginTrail(suite.trailName, suite.flowName, "", suite.T())
CreateArtifactOnTrail(suite.flowName, suite.trailName, "cli", suite.artifactFingerprint, "file1", suite.T())
Expand Down Expand Up @@ -80,43 +80,43 @@ func (suite *AttestBitbucketPRCommandTestSuite) TestAttestBitbucketPRCmd() {
wantError: true,
name: "attesting against an artifact that does not exist fails",
cmd: fmt.Sprintf(`attest pullrequest bitbucket --fingerprint 1234e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca9 --name foo
--bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test %s`, suite.defaultKosliArguments),
--bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test %s`, suite.defaultKosliArguments),
goldenRegex: "found 1 pull request\\(s\\) for commit: .*\nError: Artifact with fingerprint 1234e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca9 does not exist in trail \"test-123\" of flow \"attest-bitbucket-pr\" belonging to organization \"docs-cmd-test-user\"\n",
},
{
name: "can attest bitbucket pr against an artifact using artifact name and --artifact-type",
cmd: fmt.Sprintf(`attest pullrequest bitbucket testdata/file1 --artifact-type file --name foo
--bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test %s`, suite.defaultKosliArguments),
--bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test %s`, suite.defaultKosliArguments),
goldenRegex: "found 1 pull request\\(s\\) for commit: .*\nbitbucket pull request attestation 'foo' is reported to trail: test-123\n",
},
{
name: "can attest bitbucket pr against an artifact using artifact name and --artifact-type when --name does not exist in the trail template",
cmd: fmt.Sprintf(`attest pullrequest bitbucket testdata/file1 --artifact-type file --name bar
--bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test %s`, suite.defaultKosliArguments),
--bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test %s`, suite.defaultKosliArguments),
goldenRegex: "found 1 pull request\\(s\\) for commit: .*\nbitbucket pull request attestation 'bar' is reported to trail: test-123\n",
},
{
name: "can attest bitbucket pr against an artifact using --fingerprint",
cmd: fmt.Sprintf(`attest pullrequest bitbucket --fingerprint 7509e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca9 --name foo
--bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test %s`, suite.defaultKosliArguments),
--bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test %s`, suite.defaultKosliArguments),
goldenRegex: "found 1 pull request\\(s\\) for commit: .*\nbitbucket pull request attestation 'foo' is reported to trail: test-123\n",
},
{
name: "can attest bitbucket pr against a trail",
cmd: fmt.Sprintf(`attest pullrequest bitbucket --name bar
--bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test %s`, suite.defaultKosliArguments),
--bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test %s`, suite.defaultKosliArguments),
goldenRegex: "found 1 pull request\\(s\\) for commit: .*\nbitbucket pull request attestation 'bar' is reported to trail: test-123\n",
},
{
name: "can attest bitbucket pr against a trail when name is not found in the trail template",
cmd: fmt.Sprintf(`attest pullrequest bitbucket --name additional
--bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test %s`, suite.defaultKosliArguments),
--bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test %s`, suite.defaultKosliArguments),
goldenRegex: "found 1 pull request\\(s\\) for commit: .*\nbitbucket pull request attestation 'additional' is reported to trail: test-123\n",
},
{
name: "can attest bitbucket pr against an artifact it is created using dot syntax in --name",
cmd: fmt.Sprintf(`attest pullrequest bitbucket --name cli.foo
--bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test %s`, suite.defaultKosliArguments),
--bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test %s`, suite.defaultKosliArguments),
goldenRegex: "found 1 pull request\\(s\\) for commit: .*\nbitbucket pull request attestation 'foo' is reported to trail: test-123\n",
},
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/kosli/cli_utils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,9 @@ func (suite *CliUtilsTestSuite) TestDefaultValue() {
ci: circleci,
flag: "commit-url",
unsetTestsEnvVar: true,
envVars: map[string]string{"CIRCLE_REPOSITORY_URL": "[email protected]:ewelinawilkosz/cli-test.git", "CIRCLE_SHA1": "2492011ef04a9da09d35be706cf6a4c5bc6f1e69"},
envVars: map[string]string{"CIRCLE_REPOSITORY_URL": "[email protected]:ewelinawilkosz/cli-test.git", "CIRCLE_SHA1": "fd54040fc90e7e83f7b152619bfa18917b72c34f"},
},
want: "https://bitbucket.org/ewelinawilkosz/cli-test/commits/2492011ef04a9da09d35be706cf6a4c5bc6f1e69",
want: "https://bitbucket.org/ewelinawilkosz/cli-test/commits/fd54040fc90e7e83f7b152619bfa18917b72c34f",
},
{
name: "Lookup commit-url for CircleCI with a repo that is not from bitbucket returns correct url (with '/commit/')",
Expand Down
28 changes: 14 additions & 14 deletions cmd/kosli/reportEvidenceArtifactPRBitbucket_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,101 +39,101 @@ func (suite *ArtifactEvidencePRBitbucketCommandTestSuite) TestArtifactEvidencePR
{
name: "report Bitbucket PR evidence works with new flags (fingerprint, name ...)",
cmd: `report evidence artifact pullrequest bitbucket --fingerprint ` + suite.artifactFingerprint + ` --name bb-pr --flow ` + suite.flowName + `
--build-url http://www.example.com --bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test --commit 2492011ef04a9da09d35be706cf6a4c5bc6f1e69` + suite.defaultKosliArguments,
--build-url http://www.example.com --bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test --commit fd54040fc90e7e83f7b152619bfa18917b72c34f` + suite.defaultKosliArguments,
goldenRegex: "found 1 pull request\\(s\\) for commit: .*\nbitbucket pull request evidence is reported to artifact: .*",
},
{
wantError: true,
name: "report Bitbucket PR evidence fails when --org is missing",
cmd: `report evidence artifact pullrequest bitbucket --fingerprint ` + suite.artifactFingerprint + ` --name bb-pr --flow ` + suite.flowName + `
--build-url http://www.example.com --bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test --commit 2492011ef04a9da09d35be706cf6a4c5bc6f1e69 --api-token foo --host bar`,
--build-url http://www.example.com --bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test --commit fd54040fc90e7e83f7b152619bfa18917b72c34f --api-token foo --host bar`,
goldenRegex: "Error: --org is not set\n" +
"Usage: kosli report evidence artifact pullrequest bitbucket \\[IMAGE-NAME | FILE-PATH | DIR-PATH\\] \\[flags\\]\n",
},
{
wantError: true,
name: "report Bitbucket PR evidence fails when --name is missing",
cmd: `report evidence artifact pullrequest bitbucket --fingerprint ` + suite.artifactFingerprint + ` --flow ` + suite.flowName + `
--build-url http://www.example.com --bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli --commit 2492011ef04a9da09d35be706cf6a4c5bc6f1e69` + suite.defaultKosliArguments,
--build-url http://www.example.com --bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli --commit fd54040fc90e7e83f7b152619bfa18917b72c34f` + suite.defaultKosliArguments,
goldenRegex: "Error: required flag\\(s\\) \"name\" not set\n",
},
{
wantError: true,
name: "report Bitbucket PR evidence fails when --bitbucket-username is missing",
cmd: `report evidence artifact pullrequest bitbucket --fingerprint ` + suite.artifactFingerprint + ` --name bb-pr --flow ` + suite.flowName + `
--build-url http://www.example.com --bitbucket-workspace ewelinawilkosz --repository cli-test --commit 2492011ef04a9da09d35be706cf6a4c5bc6f1e69` + suite.defaultKosliArguments,
--build-url http://www.example.com --bitbucket-workspace kosli-dev --repository cli-test --commit fd54040fc90e7e83f7b152619bfa18917b72c34f` + suite.defaultKosliArguments,
goldenRegex: "Error: required flag\\(s\\) \"bitbucket-username\" not set\n",
},
{
wantError: true,
name: "report Bitbucket PR evidence fails when --repository is missing",
cmd: `report evidence artifact pullrequest bitbucket --fingerprint ` + suite.artifactFingerprint + ` --name bb-pr --flow ` + suite.flowName + `
--build-url http://www.example.com --bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --commit 2492011ef04a9da09d35be706cf6a4c5bc6f1e69` + suite.defaultKosliArguments,
--build-url http://www.example.com --bitbucket-username tore1 --bitbucket-workspace kosli-dev --commit fd54040fc90e7e83f7b152619bfa18917b72c34f` + suite.defaultKosliArguments,
goldenRegex: "Error: required flag\\(s\\) \"repository\" not set\n",
},
{
wantError: true,
name: "report Bitbucket PR evidence fails when --commit is missing",
cmd: `report evidence artifact pullrequest bitbucket --fingerprint ` + suite.artifactFingerprint + ` --name bb-pr --flow ` + suite.flowName + `
--build-url http://www.example.com --bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test` + suite.defaultKosliArguments,
--build-url http://www.example.com --bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test` + suite.defaultKosliArguments,
goldenRegex: "Error: required flag\\(s\\) \"commit\" not set\n",
},
{
wantError: true,
name: "report Bitbucket PR evidence fails when neither --fingerprint nor --artifact-type are set",
cmd: `report evidence artifact pullrequest bitbucket artifactNameArg --name bb-pr --flow ` + suite.flowName + `
--build-url http://www.example.com --bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test --commit 2492011ef04a9da09d35be706cf6a4c5bc6f1e69` + suite.defaultKosliArguments,
--build-url http://www.example.com --bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test --commit fd54040fc90e7e83f7b152619bfa18917b72c34f` + suite.defaultKosliArguments,
goldenRegex: "Error: either --artifact-type or --fingerprint must be specified\n" +
"Usage: kosli report evidence artifact pullrequest bitbucket \\[IMAGE-NAME | FILE-PATH | DIR-PATH\\] \\[flags\\]\n",
},
{
wantError: true,
name: "report Bitbucket PR evidence fails when commit does not exist",
cmd: `report evidence artifact pullrequest bitbucket --fingerprint ` + suite.artifactFingerprint + ` --name bb-pr --flow ` + suite.flowName + `
--build-url http://www.example.com --bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test --commit 73d7fee2f31ade8e1a9c456c324255212c3123ab` + suite.defaultKosliArguments,
--build-url http://www.example.com --bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test --commit 73d7fee2f31ade8e1a9c456c324255212c3123ab` + suite.defaultKosliArguments,
goldenRegex: "Error: map\\[error:map\\[message:Resource not found\\] type:error\\]\n",
},
{
name: "report Bitbucket PR evidence works when --assert is used and commit has a PR",
cmd: `report evidence artifact pullrequest bitbucket --fingerprint ` + suite.artifactFingerprint + ` --name bb-pr --flow ` + suite.flowName + `
--assert
--build-url http://www.example.com --bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test --commit 2492011ef04a9da09d35be706cf6a4c5bc6f1e69` + suite.defaultKosliArguments,
--build-url http://www.example.com --bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test --commit fd54040fc90e7e83f7b152619bfa18917b72c34f` + suite.defaultKosliArguments,
goldenRegex: "found 1 pull request\\(s\\) for commit: .*\nbitbucket pull request evidence is reported to artifact: .*\n",
},
{
wantError: true,
name: "report Bitbucket PR evidence fails when --assert is used and commit has no PRs",
cmd: `report evidence artifact pullrequest bitbucket --fingerprint ` + suite.artifactFingerprint + ` --name bb-pr --flow ` + suite.flowName + `
--assert
--build-url http://www.example.com --bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test --commit cb6ec5fcbb25b1ebe4859d35ab7995ab973f894c` + suite.defaultKosliArguments,
--build-url http://www.example.com --bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test --commit 3dce097040987c4693d2e4be817474d9d0063c93` + suite.defaultKosliArguments,
goldenRegex: "found 0 pull request\\(s\\) for commit: .*\nbitbucket pull request evidence is reported to artifact: .*\nError: assert failed: no pull request found for the given commit: .*\n",
},
{
name: "report Bitbucket PR evidence does not fail when commit has no PRs",
cmd: `report evidence artifact pullrequest bitbucket --fingerprint ` + suite.artifactFingerprint + ` --name bb-pr --flow ` + suite.flowName + `
--build-url http://www.example.com --bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test --commit cb6ec5fcbb25b1ebe4859d35ab7995ab973f894c` + suite.defaultKosliArguments,
--build-url http://www.example.com --bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test --commit 3dce097040987c4693d2e4be817474d9d0063c93` + suite.defaultKosliArguments,
goldenRegex: "found 0 pull request\\(s\\) for commit: .*\nbitbucket pull request evidence is reported to artifact: .*\n",
},
{
wantError: true,
name: "report Bitbucket PR evidence fails when the artifact does not exist in the server",
cmd: `report evidence artifact pullrequest bitbucket testdata/file1 --artifact-type file --name bb-pr --flow ` + suite.flowName + `
--build-url http://www.example.com --bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test --commit 2492011ef04a9da09d35be706cf6a4c5bc6f1e69` + suite.defaultKosliArguments,
--build-url http://www.example.com --bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test --commit fd54040fc90e7e83f7b152619bfa18917b72c34f` + suite.defaultKosliArguments,
goldenRegex: "found 1 pull request\\(s\\) for commit: .*\nError: Artifact with fingerprint '7509e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca9' does not exist in flow 'bitbucket-pr' belonging to organization 'docs-cmd-test-user'. \n",
},
{
wantError: true,
name: "report Bitbucket PR evidence fails when --artifact-type is unsupported",
cmd: `report evidence artifact pullrequest bitbucket testdata/file1 --artifact-type unsupported --name bb-pr --flow ` + suite.flowName + `
--build-url http://www.example.com --bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test --commit 2492011ef04a9da09d35be706cf6a4c5bc6f1e69` + suite.defaultKosliArguments,
--build-url http://www.example.com --bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test --commit fd54040fc90e7e83f7b152619bfa18917b72c34f` + suite.defaultKosliArguments,
goldenRegex: "Error: unsupported is not a supported artifact type\n",
},
{
wantError: true,
name: "report Bitbucket PR evidence fails when --user-data is not found",
cmd: `report evidence artifact pullrequest bitbucket --fingerprint ` + suite.artifactFingerprint + ` --name bb-pr --flow ` + suite.flowName + `
--user-data non-existing.json
--build-url http://www.example.com --bitbucket-username ewelinawilkosz --bitbucket-workspace ewelinawilkosz --repository cli-test --commit 2492011ef04a9da09d35be706cf6a4c5bc6f1e69` + suite.defaultKosliArguments,
--build-url http://www.example.com --bitbucket-username tore1 --bitbucket-workspace kosli-dev --repository cli-test --commit fd54040fc90e7e83f7b152619bfa18917b72c34f` + suite.defaultKosliArguments,
goldenRegex: "Error: open non-existing.json: no such file or directory\n",
},
}
Expand Down
Loading

0 comments on commit 6bc0d29

Please sign in to comment.