Merge pull request #349 from cloudfoundry-community/develop

Release 1.3.0
cloudfoundry-community · Oct 17, 2023 · 0d2ff2b · 0d2ff2b
2 parents d6796d7 + 01048c2
commit 0d2ff2b
Show file tree

Hide file tree

Showing 1,004 changed files with 131,632 additions and 20,743 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.circleci/push_tile.sh b/.circleci/push_tile.sh
diff --git a/.circleci/update_manifest.sh b/.circleci/update_manifest.sh
diff --git a/.fossa.yml b/.fossa.yml
@@ -0,0 +1,5 @@
+version: 3
+server: https://app.fossa.com
+project:
+  id: "splunk-firehose-nozzle"
+  team: "TA-Automation"
diff --git a/.circleci/functional-test.sh → .github/functional-test.sh b/.circleci/functional-test.sh → .github/functional-test.sh
diff --git a/.circleci/pre-functional-test.sh → .github/pre-functional-test.sh b/.circleci/pre-functional-test.sh → .github/pre-functional-test.sh
diff --git a/.circleci/pre-req.sh → .github/pre-req.sh b/.circleci/pre-req.sh → .github/pre-req.sh
diff --git a/.circleci/tile-builder.sh → .github/tile-builder.sh b/.circleci/tile-builder.sh → .github/tile-builder.sh
@@ -1,14 +1,14 @@
 #!/usr/bin/env bash
+echo "start"
 set -e
 wget https://github.com/cf-platform-eng/tile-generator/releases/download/v13.0.2/pcf_linux-64bit > /dev/null 2>&1
 chmod +x pcf_linux-64bit
 sudo mv pcf_linux-64bit /usr/local/bin/tile
-sudo apt install python-pip > /dev/null 2>&1
-echo "installing vurtualenv"
-sudo /usr/bin/easy_install virtualenv > /dev/null 2>&1
-virtualenv -p python tile-generator-env
+python3 -m venv tile-generator-env > /dev/null 2>&1
 source tile-generator-env/bin/activate
 echo "Installing tile-generator..."
+pip install wheel
+pip install jinja2==3.0.3
 pip install tile-generator
 cd tile
 echo "Installing bosh..."
@@ -17,4 +17,4 @@ mv bosh-cli-5.5.0-linux-amd64 bosh
 chmod +x ./bosh
 sudo mv ./bosh /usr/local/bin/bosh
 echo "Building PCF Tile for Splunk-firehose-nozzle"
-tile build
+tile build
diff --git a/.github/update_manifest.sh b/.github/update_manifest.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -e
+#Set below params in github env variable settings
+# API_ENDPOINT, API_USER, API_PASSWORD, SPLUNK_TOKEN, SPLUNK_HOST, SPLUNK_INDEX, SPLUNK_METRIC_INDEX
+#Update manifest for deployment
+sed -i 's@API_ENDPOINT:.*@'"API_ENDPOINT: $API_ENDPOINT"'@' scripts/ci_nozzle_manifest.yml
+sed -i 's@API_USER:.*@'"API_USER: $API_USER"'@' scripts/ci_nozzle_manifest.yml
+sed -i 's@API_PASSWORD:.*@'"API_PASSWORD: $API_PASSWORD"'@' scripts/ci_nozzle_manifest.yml
+sed -i 's@CLIENT_ID:.*@'"CLIENT_ID: $CLIENT_ID"'@' scripts/ci_nozzle_manifest.yml
+sed -i 's@CLIENT_SECRET:.*@'"CLIENT_SECRET: $CLIENT_SECRET"'@' scripts/ci_nozzle_manifest.yml
+sed -i 's@SPLUNK_HOST:.*@'"SPLUNK_HOST: $SPLUNK_HOST"'@' scripts/ci_nozzle_manifest.yml
+sed -i 's@SPLUNK_TOKEN:.*@'"SPLUNK_TOKEN: $SPLUNK_TOKEN"'@' scripts/ci_nozzle_manifest.yml
+sed -i 's@SPLUNK_INDEX:.*@'"SPLUNK_INDEX: $SPLUNK_INDEX"'@' scripts/ci_nozzle_manifest.yml
+sed -i 's@SPLUNK_METRIC_INDEX:.*@'"SPLUNK_METRIC_INDEX: $SPLUNK_METRIC_INDEX"'@' scripts/ci_nozzle_manifest.yml
+#copy nozzle binary from shared workspace
+#cp /tmp/splunk-firehose-nozzle .