Merge pull request #98 from splunk/main

backport
splunk · Feb 11, 2021 · 1412d6c · 1412d6c
2 parents 47d494d + d6a99ad
commit 1412d6c
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 2,230 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -65,7 +65,7 @@ jobs:
             pip install /tmp/workspace/dist/* --use-deprecated=legacy-resolver
   release:
     docker:
-      - image: circleci/node:11
+      - image: circleci/node:12
     steps:
       - checkout
       - run: npx semantic-release

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,6 +1,6 @@
 ##
 ## SPDX-FileCopyrightText: 2020 Splunk, Inc. <sales@splunk.com>
-## SPDX-License-Identifier: LicenseRef-Splunk-1-2020
+## SPDX-License-Identifier: Apache-2.0
 ##
 ##
 version: 2

diff --git a/.github/workflows/cla.yaml b/.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)

diff --git a/.github/workflows/release-notes.yaml b/.github/workflows/release-notes.yaml
@@ -15,7 +15,7 @@ jobs:
           git fetch --prune --unshallow --tags
       - uses: snyk/release-notes-preview@v1.6.1
         with:
-          releaseBranch: master
+          releaseBranch: main
         env:
           GITHUB_PR_USERNAME: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -10,12 +10,8 @@ Source: https://github.com/splunk/addonfactory-ucc-generator
 # License: ...
 Files: splunk_add_on_ucc_framework/UCC-UI-lib/*
 Copyright: 202 Splunk Inc. <addonfactory@splunk.com>
-License: LicenseRef-Splunk-1-2020
-
-Files: .* poetry.lock tests tox.ini splunk_add_on_ucc_framework/templates/* splunk_add_on_ucc_framework/modular_alert_builder/build_core/* splunk_add_on_ucc_framework/arf_dir_templates/*
-Copyright: 2020 Splunk Inc. <addonfactory@splunk.com>
 License: Apache-2.0
 
-Files: semtag
-Copyright: 2020 Nico Hormazábal <pnikosis>
+Files: CLA.md CODE_OF_CONDUCT.md .* poetry.lock tests tox.ini splunk_add_on_ucc_framework/templates/* splunk_add_on_ucc_framework/modular_alert_builder/build_core/* splunk_add_on_ucc_framework/arf_dir_templates/*
+Copyright: 2020 Splunk Inc. <addonfactory@splunk.com>
 License: Apache-2.0
diff --git a/LICENSES/LicenseRef-Splunk-1-2020.txt b/LICENSES/LicenseRef-Splunk-1-2020.txt
diff --git a/README.md b/README.md
@@ -63,7 +63,7 @@ By the running the `ucc-gen` command, the following steps are executed:
 
 7. Replace tokens in views.
 8. Copy addon's `package/*` to `output/<package_ID>/*` directory.
-
+9. If an addon requires some additional configurations in packaging than implement the steps in additional_packaging.py
 
 ## Params
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6 +1,6 @@
 ##
 ## SPDX-FileCopyrightText: 2020 Splunk, Inc. <sales@splunk.com>
-## SPDX-License-Identifier: LicenseRef-Splunk-1-2020
+## SPDX-License-Identifier: Apache-2.0
 ##
 ##
 version: "3.7"

diff --git a/pytest.ini b/pytest.ini
@@ -1,6 +1,6 @@
 ##
 ## SPDX-FileCopyrightText: 2020 Splunk, Inc. <sales@splunk.com>
-## SPDX-License-Identifier: LicenseRef-Splunk-1-2020
+## SPDX-License-Identifier: Apache-2.0
 ##
 ##
 [pytest]