Merge pull request #44 from Financial-Times/major/UPPSF-5515-remove-snyk

Major/uppsf 5515 remove snyk

.circleci/test-deploy.yml

@@ -14,10 +14,10 @@ only_tags: &only_tags
   tags:
     only: /^v[0-9]+\.[0-9]+\.[0-9]+$/
 
-only_master: &only_master
+only_main: &only_main
   branches:
     only:
-      - master
+      - main
 
 workflows:
   integration-test-prod-release:
@@ -84,7 +84,7 @@ workflows:
     triggers:
       - schedule:
           cron: "0 0 1 1,3,5,7,9,11 *"
-          filters: *only_master
+          filters: *only_main
     jobs:
       - orb-tools/pack
       - orb-tools/publish:

README.md

@@ -9,7 +9,7 @@ Please refer to [CircleCI registry](https://circleci.com/orbs/registry/orb/finan
 There are two CircleCI workflows associated with this project. They have different behaviour depending on whether they are triggered by commit push or by creating specific git tag.
 1. On push
 
-When you are pushing a commit in any branch including master, the first setup workflow is going to: 
+When you are pushing a commit in any branch including main, the first setup workflow is going to: 
 * Lint the orb's code.
 * Pack the orb source code into single yaml file.
 * Review if the orb source code complies to predefined list of best practices.
@@ -22,7 +22,7 @@ When you are pushing a commit, the second workflow is going to:
 
 2. On tag
 
-When you are creating a new tag from master branch (you can use the simple GitHub UI to create new release with associated git tag), the first workflow is going to:
+When you are creating a new tag from main branch (you can use the simple GitHub UI to create new release with associated git tag), the first workflow is going to:
 * Lint the orb's code.
 * Pack the orb source code into single yaml file.
 * Review if the orb source code complies to predefined list of best practices.
@@ -43,7 +43,7 @@ In order to create a new version of this orb and release it to CircleCI registry
 - Checkout a new branch and make your changes there. 
 - Make sure that all checks are passing for your branch and make PR
 - You can test the orb at this point in another project referring to it as `financial-times/golang-ci@dev:alpha` or `financial-times/golang-ci@dev:<SHA1>`
-- After the PR is approved by 2 reviewers, you can merge it to master
+- After the PR is approved by 2 reviewers, you can merge it to main
 - Create a GitHub release with the appropriate tag following [semantic versioning standard](https://semver.org/).
 
 #### Some resource on writing CircleCI orbs

go.mod

@@ -1,3 +1,3 @@
 module github.com/Financial-Times/golang-ci-orb
 
-go 1.21
+go 1.22

src/@orb.yml

@@ -9,6 +9,3 @@ description: >
 # This information will be displayed in the orb registry.
 display:
   source_url: "https://github.com/Financial-Times/golang-ci-orb"
-
-orbs:
-  snyk: snyk/[email protected]

src/examples/use-default-with-mysql-with-params.yml

@@ -21,9 +21,3 @@ usage:
             name: build-docker-image
             requires:
               - build-and-test-project
-
-    snyk-scanning:
-      jobs:
-        - ft-golang-ci/scan:
-            name: scan-dependencies
-            context: cm-team-snyk

src/examples/use-default-with-postgres-with-params.yml

@@ -21,9 +21,3 @@ usage:
             name: build-docker-image
             requires:
               - build-and-test-project
-
-    snyk-scanning:
-      jobs:
-        - ft-golang-ci/scan:
-            name: scan-dependencies
-            context: cm-team-snyk

src/examples/use-defaults.yml

@@ -12,12 +12,6 @@ usage:
         - golang-ci/build-and-test:
             name: build-and-test-project
 
-        - golang-ci/scan:
-            name: scan-dependencies
-            context: some-context-with-snyk-token
-            requires:
-              - build-and-test-project
-
         - golang-ci/docker-build:
             name: build-docker-image
             requires: