Merge pull request #36 from splunk/test/common-template-changes-for-u…

…nit-modinput

test: sync for policy

.circleci/config.yml

@@ -83,17 +83,17 @@ orbs:
               command: |
                 git remote set-url origin https://${GH_USER}:${GH_TOKEN}@github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}.git
                 ./semtag <<parameters.tag_level>>
-      merge-to-master:
+      merge-to-main:
         steps:
           - run:
               name: Merge
               command: |
                 git remote set-url origin https://${GH_USER}:${GH_TOKEN}@github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}.git
                 git config --global user.email "[email protected]"
                 git config --global user.name "Add on release service"
-                git pull origin master
-                git merge master -m "Merge from master"
-                git checkout master
+                git pull origin main
+                git merge main -m "Merge from main"
+                git checkout main
                 git merge develop
                 git push
     jobs:
@@ -107,11 +107,11 @@ orbs:
           - checkout
           - tag:
               tag_level: <<parameters.tag_level>>
-      merge-to-master:
+      merge-to-main:
         executor: python37
         steps:
           - checkout
-          - merge-to-master
+          - merge-to-main
 
 jobs:
   splunk-app-inspect:
@@ -635,11 +635,14 @@ workflows:
           filters:
             branches:
               only: 
-                - master
+                - main
                 - develop
       - release:
           requires:
             - approval-release
+            - splunk-app-inspect
+            - splunk-app-unit-test
+            - splunk-app-backend-test
           context:
             - gdi-github
   publish:

.github/dependabot.yml

@@ -27,7 +27,17 @@ updates:
     schedule:
       interval: "daily"
   - package-ecosystem: "pip"
-    directory: "/tests"
+    directory: "/package/lib"
+    target-branch: "develop"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "pip"
+    directory: "/package/lib/py2"
+    target-branch: "develop"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "pip"
+    directory: "/package/lib/py3"
     target-branch: "develop"
     schedule:
       interval: "daily"

.github/workflows/cla.yaml

@@ -21,7 +21,7 @@ jobs:
           path-to-signatures: ".github/signatures/version1/cla.json"
           path-to-document: "https://github.com/splunk/addonfactory-test-releaseci/blob/main/CLA.md" # e.g. a CLA or a DCO document
           # branch should not be protected
-          branch: "master"
+          branch: "main"
           allowlist: dependabot
           #below are the optional inputs - If the optional inputs are not given, then default values will be taken
           #remote-organization-name: enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository)

.github/workflows/rebase.yml

@@ -0,0 +1,18 @@
+on:
+  issue_comment:
+    types: [created]
+name: Automatic Rebase
+jobs:
+  rebase:
+    name: Rebase
+    if: github.event.comment.author_association == 'MEMBER' && github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the latest code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Automatic Rebase
+        uses: cirrus-actions/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release-notes.yml

@@ -2,7 +2,7 @@ name: Release-Notes-Preview
 
 on:
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
   issue_comment:
     types: [edited]
 
@@ -15,7 +15,7 @@ jobs:
           git fetch --unshallow --tags
       - uses: snyk/[email protected]
         with:
-          releaseBranch: master
+          releaseBranch: main
         env:
           GITHUB_PR_USERNAME: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "deps/apps/Splunk_SA_CIM"]
 	path = deps/apps/Splunk_SA_CIM
 	url = [email protected]:splunk/addonfactory-splunk_sa_cim.git
-[submodule "deps/apps/splunk_env_indexer"]
-	path = deps/apps/splunk_env_indexer
-	url = [email protected]:splunk/addonfactory-splunk_env_indexer.git

.python-version

@@ -0,0 +1,2 @@
+3.7.8
+2.7.18

.releaserc.yaml

@@ -1,7 +1,7 @@
 ---
 branches:
   - "+([0-9])?(.{+([0-9]),x}).x"
-  - master
+  - main
   - name: develop
     channel: beta
     prerelease: true

docker-compose.yml

@@ -58,4 +58,4 @@ services:
     environment:
       - SPLUNK_PASSWORD=${SPLUNK_PASSWORD}
       - SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
-      - SPLUNK_START_ARGS=--accept-license
+      - SPLUNK_START_ARGS=--accept-license

pytest.ini

@@ -6,7 +6,7 @@
 [pytest]
 norecursedirs = .git .venv venv build deps tests/deps node_modules package
 addopts = -v --tb=long
-    --splunk-data-generator=tests/data
+    --splunk-data-generator=tests/knowledge
     --splunk-type=docker
     --sc4s-host=sc4s
     -n 1

semtag

@@ -50,7 +50,7 @@ Commands:
   getcurrent Returns the current version, based on the latest one, if there are uncommited or
                unstaged changes, they will be reflected in the version, adding the number of
                pending commits, current branch and commit hash.
-  final      Tags the current build as a final version, this only can be done on the master branch.
+  final      Tags the current build as a final version, this only can be done on the main branch.
   candidate  Tags the current build as a release candidate, the tag will contain all
                the commits from the last final version.
   alpha      Tags the current build as an alpha version, the tag will contain all
@@ -533,7 +533,7 @@ function get_current {
   else
     local __buildinfo="$(git rev-parse --short HEAD)"
     local __currentbranch="$(git rev-parse --abbrev-ref HEAD)"
-    if [ "$__currentbranch" != "master" ]; then
+    if [ "$__currentbranch" != "main" ]; then
       __buildinfo="$__currentbranch.$__buildinfo"
     fi
 
@@ -582,10 +582,10 @@ case $ACTION in
     ;;
   final)
     init
-    diff=$(git diff master | cat)
+    diff=$(git diff main | cat)
     if [ "$forcetag" == "false" ]; then
       if [ -n "$diff" ]; then
-        echo "ERROR: Branch must be updated with master for final versions"
+        echo "ERROR: Branch must be updated with main for final versions"
         exit 1
       fi
     fi

tests/knowledge/test_addon.py

@@ -11,3 +11,4 @@
 class Test_App(Basic):
     def empty_method(self):
         pass
+