Merge pull request #13 from JoseLSegura/initial_fixes

Initial fixes

Makefile

@@ -1,4 +1,4 @@
-.PHONY: help clean build fmt lint vet run test cover style cyclo
+.PHONY: default clean build fmt lint vet cyclo ineffassign shellcheck errcheck goconst gosec abcgo style run test cover integration_tests rest_api_tests license before_commit help
 
 SOURCES:=$(shell find . -name '*.go')
 
@@ -31,7 +31,7 @@ ineffassign: ## Run ineffassign checker
 	./ineffassign.sh
 
 shellcheck: ## Run shellcheck
-	shellcheck *.sh
+	shellcheck $(shell find . -name "*.sh")
 
 errcheck: ## Run errcheck
 	@echo "Running errcheck"

abcgo.sh

@@ -15,8 +15,6 @@
 
 threshold=45
 
-RED=$(tput setaf 1)
-GREEN=$(tput setaf 2)
 BLUE=$(tput setaf 4)
 RED_BG=$(tput setab 1)
 GREEN_BG=$(tput setab 2)

build.sh

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # this is improper - we need to start using tags in GitHub properly
-version=0.5
+version=0.1
 
 buildtime=$(date)
 branch=$(git rev-parse --abbrev-ref HEAD)

go.mod

@@ -6,6 +6,11 @@ require (
 	github.com/BurntSushi/toml v0.3.1
 	github.com/RedHatInsights/insights-operator-utils v0.0.0-20200430065955-b0b675035360
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	github.com/droptheplot/abcgo v0.0.0-20171120220436-23529565504c // indirect
+	github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf // indirect
+	github.com/kisielk/errcheck v1.2.0 // indirect
 	github.com/rs/zerolog v1.18.0
+	github.com/securego/gosec v0.0.0-20200401082031-e946c8c39989 // indirect
 	github.com/spf13/viper v1.6.3
+	golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
 )

gosec.sh

@@ -20,11 +20,6 @@ NC=$(tput sgr0) # No Color
 
 GO_SEC_ARGS=""
 
-VERBOSE=false
-if [[ $* == *verbose* ]]; then
-    VERBOSE=true
-fi
-
 if [[ $* != *verbose* ]]; then
     GO_SEC_ARGS="-quiet"
 fi

server/configuration.go

@@ -21,4 +21,7 @@ type Configuration struct {
 	Address     string `mapstructure:"address" toml:"address"`
 	APIPrefix   string `mapstructure:"api_prefix" toml:"api_prefix"`
 	APISpecFile string `mapstructure:"api_spec_file" toml:"api_spec_file"`
+	Debug       bool   `mapstructure:"debug" toml:"debug"`
+	Auth        bool   `mapstructure:"auth" toml:"auth"`
+	AuthType    string `mapstructure:"auth_type" toml:"auth_type"`
 }

server/server.go

@@ -18,3 +18,13 @@ limitations under the License.
 // Insights content service. In current version, the following
 // REST API endpoints are available:
 package server
+
+import (
+	"net/http"
+)
+
+// HTTPServer in an implementation of Server interface
+type HTTPServer struct {
+	Config Configuration
+	Serv   *http.Server
+}