Merge pull request #7 from slashdevops/fix-test

christiangda · web-flow · commit 7b0582e29dab · 2024-06-11T14:46:59.000+02:00
refactor: remove unnecessary pipeline
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,13 +24,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.18
+          go-version: ^1.22.4
         id: go
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install promu
         run: make promu
@@ -47,13 +47,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.18
+          go-version: ^1.22.4
         id: go
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install promu
         run: make promu
@@ -68,7 +68,7 @@ jobs:
         run: ls -la .build
 
       - name: Upload .build artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: .build
           path: .build
@@ -79,13 +79,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.18
+          go-version: ^1.22.4
         id: go
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install promu
         run: make promu
@@ -94,7 +94,7 @@ jobs:
         run: docker version
 
       - name: Download .build artifacts from Build Step
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: .build
           path: .build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,13 +16,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.18
+          go-version: ^1.22.4
         id: go
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install promu
         run: make promu
@@ -39,13 +39,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.18
+          go-version: ^1.22.4
         id: go
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install promu
         run: make promu
@@ -60,7 +60,7 @@ jobs:
         run: ls -la .build
 
       - name: Upload .build artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: .build
           path: .build
@@ -71,13 +71,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.18
+          go-version: ^1.22.4
         id: go
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install promu
         run: make promu
@@ -89,7 +89,7 @@ jobs:
         run: docker version
 
       - name: Download .build artifacts from Build Step
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: .build
           path: .build
@@ -134,7 +134,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create Release
         id: create_github_release
@@ -154,13 +154,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.18
+          go-version: ^1.22.4
         id: go
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install promu
         run: make promu
@@ -169,7 +169,7 @@ jobs:
         run: promu info
 
       - name: Download .build artifacts from Build Step
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: .build
           path: .build
@@ -195,7 +195,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload Artifacts to Github
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: releases
           path: .tarballs
diff --git a/.promu.yml b/.promu.yml
@@ -1,7 +1,7 @@
 go:
   # Whenever the Go version is updated here, .circle/config.yml should also
   # be updated.
-  version: 1.18
+  version: 1.22.4
 
 repository:
   path: github.com/slashdevops/aws_cloudwatch_exporter
diff --git a/cmd/server.go b/cmd/server.go
@@ -70,25 +70,25 @@ func init() {
 	}
 
 	// ReadTimeout
-	serverCmd.PersistentFlags().DurationVar(&conf.Server.ReadTimeout, "readTimeout", 2*time.Second, "ReadTimeout is the maximum duration for reading the entire request, including the body. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/master/docs/server.md")
+	serverCmd.PersistentFlags().DurationVar(&conf.Server.ReadTimeout, "readTimeout", 2*time.Second, "ReadTimeout is the maximum duration for reading the entire request, including the body. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/main/docs/server.md")
 	if err := viper.BindPFlag("server.readTimeout", serverCmd.PersistentFlags().Lookup("readTimeout")); err != nil {
 		log.Error(err)
 	}
 
 	// WriteTimeout
-	serverCmd.PersistentFlags().DurationVar(&conf.Server.WriteTimeout, "writeTimeout", 5*time.Second, "WriteTimeout is the maximum duration before timing out writes of the response. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/master/docs/server.md")
+	serverCmd.PersistentFlags().DurationVar(&conf.Server.WriteTimeout, "writeTimeout", 5*time.Second, "WriteTimeout is the maximum duration before timing out writes of the response. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/main/docs/server.md")
 	if err := viper.BindPFlag("server.writeTimeout", serverCmd.PersistentFlags().Lookup("writeTimeout")); err != nil {
 		log.Error(err)
 	}
 
 	// IdleTimeout
-	serverCmd.PersistentFlags().DurationVar(&conf.Server.IdleTimeout, "idleTimeout", 60*time.Second, "IdleTimeout is the maximum amount of time to wait for the next request when keep-alives are enabled. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/master/docs/server.md")
+	serverCmd.PersistentFlags().DurationVar(&conf.Server.IdleTimeout, "idleTimeout", 60*time.Second, "IdleTimeout is the maximum amount of time to wait for the next request when keep-alives are enabled. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/main/docs/server.md")
 	if err := viper.BindPFlag("server.idleTimeout", serverCmd.PersistentFlags().Lookup("idleTimeout")); err != nil {
 		log.Error(err)
 	}
 
 	// ReadHeaderTimeout
-	serverCmd.PersistentFlags().DurationVar(&conf.Server.ReadHeaderTimeout, "readHeaderTimeout", 5*time.Second, "ReadHeaderTimeout is the amount of time allowed to read request headers. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/master/docs/server.md")
+	serverCmd.PersistentFlags().DurationVar(&conf.Server.ReadHeaderTimeout, "readHeaderTimeout", 5*time.Second, "ReadHeaderTimeout is the amount of time allowed to read request headers. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/main/docs/server.md")
 	if err := viper.BindPFlag("server.readHeaderTimeout", serverCmd.PersistentFlags().Lookup("readHeaderTimeout")); err != nil {
 		log.Error(err)
 	}
@@ -100,7 +100,7 @@ func init() {
 	}
 
 	// KeepAlivesEnabled
-	serverCmd.PersistentFlags().BoolVar(&conf.Server.KeepAlivesEnabled, "keepAlivesEnabled", true, "KeepAlivesEnabled controls whether HTTP keep-alives are enabled. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/master/docs/server.md")
+	serverCmd.PersistentFlags().BoolVar(&conf.Server.KeepAlivesEnabled, "keepAlivesEnabled", true, "KeepAlivesEnabled controls whether HTTP keep-alives are enabled. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/main/docs/server.md")
 	if err := viper.BindPFlag("server.keepAlivesEnabled", serverCmd.PersistentFlags().Lookup("keepAlivesEnabled")); err != nil {
 		log.Error(err)
 	}
@@ -113,7 +113,6 @@ func init() {
 }
 
 func startCmd(cmd *cobra.Command, args []string) {
-
 	loadFromConfigFiles(conf.Application.ServerFile, &conf)
 	loadFromMetricsFiles(&conf)
 	validateMetricsQueries(&conf)

Original file line number	Diff line number	Diff line change
`@@ -70,25 +70,25 @@ func init() {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`// ReadTimeout`
`73`		`- serverCmd.PersistentFlags().DurationVar(&conf.Server.ReadTimeout, "readTimeout", 2*time.Second, "ReadTimeout is the maximum duration for reading the entire request, including the body. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/master/docs/server.md")`
	`73`	`+ serverCmd.PersistentFlags().DurationVar(&conf.Server.ReadTimeout, "readTimeout", 2*time.Second, "ReadTimeout is the maximum duration for reading the entire request, including the body. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/main/docs/server.md")`
`74`	`74`	`if err := viper.BindPFlag("server.readTimeout", serverCmd.PersistentFlags().Lookup("readTimeout")); err != nil {`
`75`	`75`	`log.Error(err)`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`// WriteTimeout`
`79`		`- serverCmd.PersistentFlags().DurationVar(&conf.Server.WriteTimeout, "writeTimeout", 5*time.Second, "WriteTimeout is the maximum duration before timing out writes of the response. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/master/docs/server.md")`
	`79`	`+ serverCmd.PersistentFlags().DurationVar(&conf.Server.WriteTimeout, "writeTimeout", 5*time.Second, "WriteTimeout is the maximum duration before timing out writes of the response. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/main/docs/server.md")`
`80`	`80`	`if err := viper.BindPFlag("server.writeTimeout", serverCmd.PersistentFlags().Lookup("writeTimeout")); err != nil {`
`81`	`81`	`log.Error(err)`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`// IdleTimeout`
`85`		`- serverCmd.PersistentFlags().DurationVar(&conf.Server.IdleTimeout, "idleTimeout", 60*time.Second, "IdleTimeout is the maximum amount of time to wait for the next request when keep-alives are enabled. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/master/docs/server.md")`
	`85`	`+ serverCmd.PersistentFlags().DurationVar(&conf.Server.IdleTimeout, "idleTimeout", 60*time.Second, "IdleTimeout is the maximum amount of time to wait for the next request when keep-alives are enabled. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/main/docs/server.md")`
`86`	`86`	`if err := viper.BindPFlag("server.idleTimeout", serverCmd.PersistentFlags().Lookup("idleTimeout")); err != nil {`
`87`	`87`	`log.Error(err)`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`// ReadHeaderTimeout`
`91`		`- serverCmd.PersistentFlags().DurationVar(&conf.Server.ReadHeaderTimeout, "readHeaderTimeout", 5*time.Second, "ReadHeaderTimeout is the amount of time allowed to read request headers. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/master/docs/server.md")`
	`91`	`+ serverCmd.PersistentFlags().DurationVar(&conf.Server.ReadHeaderTimeout, "readHeaderTimeout", 5*time.Second, "ReadHeaderTimeout is the amount of time allowed to read request headers. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/main/docs/server.md")`
`92`	`92`	`if err := viper.BindPFlag("server.readHeaderTimeout", serverCmd.PersistentFlags().Lookup("readHeaderTimeout")); err != nil {`
`93`	`93`	`log.Error(err)`
`94`	`94`	`}`
`@@ -100,7 +100,7 @@ func init() {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`// KeepAlivesEnabled`
`103`		`- serverCmd.PersistentFlags().BoolVar(&conf.Server.KeepAlivesEnabled, "keepAlivesEnabled", true, "KeepAlivesEnabled controls whether HTTP keep-alives are enabled. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/master/docs/server.md")`
	`103`	`+ serverCmd.PersistentFlags().BoolVar(&conf.Server.KeepAlivesEnabled, "keepAlivesEnabled", true, "KeepAlivesEnabled controls whether HTTP keep-alives are enabled. see: https://github.com/slashdevops/aws_cloudwatch_exporter/blob/main/docs/server.md")`
`104`	`104`	`if err := viper.BindPFlag("server.keepAlivesEnabled", serverCmd.PersistentFlags().Lookup("keepAlivesEnabled")); err != nil {`
`105`	`105`	`log.Error(err)`
`106`	`106`	`}`
`@@ -113,7 +113,6 @@ func init() {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`func startCmd(cmd *cobra.Command, args []string) {`
`116`		`-`
`117`	`116`	`loadFromConfigFiles(conf.Application.ServerFile, &conf)`
`118`	`117`	`loadFromMetricsFiles(&conf)`
`119`	`118`	`validateMetricsQueries(&conf)`