Merge branch 'master' into mzibrick-ccxdev14488

ccx_notification_writer.go

@@ -47,6 +47,7 @@ package main
 import (
 	"flag"
 	"fmt"
+	"math"
 	"net/http"
 	"os"
 	"strconv"
@@ -685,7 +686,13 @@ func PerformMigrations(configuration *ConfigStruct, migParam string) (exitStatus
 			err = convErr
 			return
 		}
-		desiredVersion = utils.Version(vers)
+		if vers < 0 || vers > math.MaxUint32 {
+			log.Error().Err(err).Msgf("Unable to parse migration version: %v version out of range", migParam)
+			exitStatus = ExitStatusMigrationError
+			err = fmt.Errorf("version out of range: %v", vers)
+			return
+		}
+		desiredVersion = utils.Version(uint32(vers))
 	}
 
 	// perform database migration

goerrcheck.sh

@@ -25,7 +25,7 @@ echo -e "${BLUE}Finding all unchecked errors${NC}"
 if ! [ -x "$(command -v errcheck)" ]
 then
     echo -e "${BLUE}Installing errcheck ${NC}"
-    GO111MODULE=off go get github.com/kisielk/errcheck
+    GO111MODULE=on go install github.com/kisielk/errcheck@latest
 fi
 
 

ineffassign.sh

@@ -24,7 +24,7 @@ echo -e "${BLUE}Detecting ineffectual assignments in Go code${NC}"
 if ! [ -x "$(command -v ineffassign)" ]
 then
     echo -e "${BLUE}Installing ineffassign${NC}"
-    GO111MODULE=off go get github.com/gordonklaus/ineffassign
+    GO111MODULE=on go install github.com/gordonklaus/ineffassign@latest
 fi
 
 if ! ineffassign ./...

pr_check.sh

@@ -11,7 +11,7 @@ APP_NAME="ccx-data-pipeline"  # name of app-sre "application" folder this compon
 #       git version of clowdapp.yaml(or any other) file from the pull request.
 COMPONENT_NAME="ccx-notification-writer ccx-notification-db-cleaner"  # name of app-sre "resourceTemplate" in deploy.yaml for this component
 IMAGE="quay.io/cloudservices/ccx-notification-writer"
-COMPONENTS="ccx-data-pipeline ccx-insights-results dvo-writer ccx-smart-proxy ccx-notification-writer ccx-notification-service ccx-notification-db-cleaner notifications-backend notifications-aggregator notifications-engine insights-content-service ccx-mock-ams ccx-upgrades-sso-mock insights-content-template-renderer"  # space-separated list of components to load
+COMPONENTS="ccx-data-pipeline ccx-insights-results ccx-redis dvo-writer ccx-smart-proxy ccx-notification-writer ccx-notification-service ccx-notification-db-cleaner notifications-backend notifications-aggregator notifications-engine insights-content-service ccx-mock-ams ccx-upgrades-sso-mock insights-content-template-renderer"  # space-separated list of components to load
 COMPONENTS_W_RESOURCES="ccx-notification-writer"  # component to keep
 CACHE_FROM_LATEST_IMAGE="true"
 DEPLOY_FRONTENDS="false"