diff --git a/.circleci/config.yml b/.circleci/config.yml index f71624b6..087e1668 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,8 +9,8 @@ jobs: - run: name: Install Dependencies command: | - curl https://glide.sh/get | sh - go get -t ./... + go get -u -v -t github.com/Masterminds/glide + glide install --strip-vendor - run: name: Builder command: make build @@ -20,7 +20,7 @@ jobs: make testall cp splunk-firehose-nozzle /tmp - persist_to_workspace: - root: /tmp + root: /tmp paths: - splunk-firehose-nozzle @@ -35,8 +35,8 @@ jobs: - run: name: Install dependencies command: | - curl https://glide.sh/get | sh - go get -t ./... + go get -u -v -t github.com/Masterminds/glide + glide install --strip-vendor cp -R /tmp/splunk-firehose-nozzle . - run: name: Deploy nozzle @@ -75,8 +75,8 @@ jobs: - run: name: Install dependencies command: | - curl https://glide.sh/get | sh - go get -t ./... + go get -u -v -t github.com/Masterminds/glide + glide install --strip-vendor cp -R /tmp/splunk-firehose-nozzle . - run: name: Deploy data-gen @@ -112,20 +112,21 @@ workflows: build-and-deploy-nozzle: jobs: - build -# - deploy-nozzle: -# requires: -# - build -# # - tile-builder: -# # requires: -# # - deploy-nozzle -# # filters: -# # branches: -# # only: master -# - execute_tests: -# requires: -# - deploy-nozzle -# filters: -# branches: -# only: -# - master -# - release/v1.2.0 \ No newline at end of file + - deploy-nozzle: + requires: + - build +# - tile-builder: +# requires: +# - deploy-nozzle +# filters: +# branches: +# only: master + - execute_tests: + requires: + - deploy-nozzle + filters: + branches: + only: + - develop + - master +# - release/v1.2.0 \ No newline at end of file diff --git a/.circleci/pre-req.sh b/.circleci/pre-req.sh index 0ba6091a..bec30214 100755 --- a/.circleci/pre-req.sh +++ b/.circleci/pre-req.sh @@ -6,8 +6,8 @@ make wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo apt-key add - echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list #Add support for https apt sources -sudo apt-get install apt-transport-https ca-certificates sudo apt-get update +sudo apt-get install apt-transport-https ca-certificates sudo apt-get install cf-cli #CF Login cf login --skip-ssl-validation -a $API_ENDPOINT -u $API_USER -p $API_PASSWORD -o system -s system diff --git a/eventwriter/splunk.go b/eventwriter/splunk.go index 8679083d..9d3ba42e 100644 --- a/eventwriter/splunk.go +++ b/eventwriter/splunk.go @@ -87,7 +87,7 @@ func (s *splunkClient) send(postBody *[]byte) error { //Add app headers for HEC telemetry //Todo: update static values with appName and appVersion variables req.Header.Set("__splunk_app_name", "Splunk Firehose Nozzle") - req.Header.Set("__splunk_app_version", "1.2.0") + req.Header.Set("__splunk_app_version", "1.2.2") resp, err := s.httpClient.Do(req) if err != nil { diff --git a/eventwriter/splunk_test.go b/eventwriter/splunk_test.go index b726bac9..b3e48b4c 100644 --- a/eventwriter/splunk_test.go +++ b/eventwriter/splunk_test.go @@ -104,7 +104,7 @@ var _ = Describe("Splunk", func() { }) It("sets app appVersion", func() { - appVersion := "1.2.0" + appVersion := "1.2.2" client := NewSplunk(config) events := []map[string]interface{}{}