Fix CI/CD, bump version to 1.10.0 (#315)

* Fix CI/CD, bump version to 1.10.0
* Fix file perms
* Fix sonarcloud

Author: Tim Middleton

.github/workflows/build-monitoring.yaml

@@ -5,7 +5,7 @@
 # ---------------------------------------------------------------------------
 # Coherence CLI GitHub Actions CI Build Monitoring
 # ---------------------------------------------------------------------------
-name: Build Monitoring
+name: CI Build Monitoring
 
 on:
   workflow_dispatch:
@@ -24,17 +24,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Get Docker Images
-        shell: bash
-        run: |
-          docker pull gcr.io/distroless/java17
-
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          java-version: '17'
-          distribution: 'zulu'
-
       - name: Cache Go Modules
         uses: actions/cache@v4
         with:
@@ -62,10 +51,12 @@ jobs:
           export PATH=`pwd`/bin:$PATH
           cohctl init monitoring -y
           cohctl start monitoring 
-          sleep 30
+          sleep 15
+          netstat -an | grep 9090
+          netstat -an | grep 3000
           cohctl get monitoring
-          curl -s http://localhost:9090/-/healthy
-          curl -s http://localhost:3000/api/health
+          curl -s http://127.0.0.1:9090/-/healthy
+          curl -s http://127.0.0.1:3000/api/health
           cohctl stop monitoring
 
       - uses: actions/upload-artifact@v4

Makefile

@@ -15,7 +15,7 @@
 # ======================================================================================================================
 
 # The version of the CLI being build - this should be a valid SemVer format
-VERSION ?= 1.9.2
+VERSION ?= 1.10.0
 MILESTONE ?=
 SHELL := /bin/bash
 

docs/sitegen.yaml

@@ -11,7 +11,7 @@ engine:
     attributes:
       plantumlconfig: "_plantuml-config.txt"
       commercial-docs-base-url: "https://docs.oracle.com/en/middleware/fusion-middleware/coherence/14.1.2"
-      cli-version: "1.9.2"
+      cli-version: "1.10.0"
       coherence-version: "14.1.2-0-2"
       coherence-default-version: "14.1.2-0-2"
 assets:
@@ -35,7 +35,7 @@ backend:
     name: "vuetify"
     homePage: "docs/about/overview.adoc"
     releases:
-        - "1.9.2"
+        - "1.10.0"
     navigation:
       type: "ROOT"
       title: "Coherence CLI"

pkg/cmd/monitoring.go

@@ -22,13 +22,16 @@ import (
 )
 
 const (
-	monitoringDirectory = "monitoring"
-	dashboardsDirectory = "dashboards"
-	dashboardBaseURL    = "https://raw.githubusercontent.com/oracle/coherence-operator/refs/heads/main/dashboards/grafana"
-	configBaseURL       = "https://raw.githubusercontent.com/oracle/coherence-cli/refs/heads/main/monitoring"
-	grafanaPort         = 3000
-	prometheusPort      = 9090
-	dockerComposeYAML   = "docker-compose.yaml"
+	monitoringDirectory     = "monitoring"
+	dashboardsDirectory     = "dashboards"
+	dashboardBaseURL        = "https://raw.githubusercontent.com/oracle/coherence-operator/refs/heads/main/dashboards/grafana"
+	configBaseURL           = "https://raw.githubusercontent.com/oracle/coherence-cli/refs/heads/main/monitoring"
+	grafanaPort             = 3000
+	prometheusPort          = 9090
+	dockerComposeYAML       = "docker-compose.yaml"
+	localhost               = "127.0.0.1"
+	useDockerComposeMessage = "use docker-compose instead of docker compose"
+	dockerCompose           = "docker-compose"
 )
 
 var (
@@ -66,6 +69,8 @@ var (
 		dockerComposeYAML,
 		"prometheus.yaml",
 	}
+
+	useDockerCompose bool
 )
 
 // initMonitoringCmd represents the init monitoring command.
@@ -151,10 +156,10 @@ the environment is setup correctly.`,
 			grafanaOutput    string
 			promOutput       string
 			err              = mon.validateEnvironment()
-			promURL          = fmt.Sprintf("http://localhost:%v/", prometheusPort)
+			promURL          = fmt.Sprintf("http://%s:%v/", localhost, prometheusPort)
 			promHealthURL    = fmt.Sprintf("%s-/healthy", promURL)
-			grafanaURL       = fmt.Sprintf("http://localhost:%v/d/coh-main/coherence-dashboard-main", grafanaPort)
-			grafanaHealthURL = fmt.Sprintf("http://localhost:%d/api/health", grafanaPort)
+			grafanaURL       = fmt.Sprintf("http://%s:%v/d/coh-main/coherence-dashboard-main", localhost, grafanaPort)
+			grafanaHealthURL = fmt.Sprintf("http://%s:%d/api/health", localhost, grafanaPort)
 		)
 
 		if err != nil {
@@ -211,7 +216,7 @@ Prometheus using docker compose.`,
 			return err
 		}
 
-		err = mon.dockerCommand([]string{"compose", "-f", path.Join(mon.monitoringDir, dockerComposeYAML), "up", "-d"})
+		err = mon.dockerComposeCommand([]string{"-f", path.Join(mon.monitoringDir, dockerComposeYAML), "up", "-d"})
 		if err != nil {
 			return err
 		}
@@ -244,7 +249,7 @@ using docker compose.`,
 			return nil
 		}
 
-		err = mon.dockerCommand([]string{"compose", "-f", path.Join(mon.monitoringDir, dockerComposeYAML), "down"})
+		err = mon.dockerComposeCommand([]string{"-f", path.Join(mon.monitoringDir, dockerComposeYAML), "down"})
 		if err != nil {
 			return err
 		}
@@ -392,6 +397,22 @@ func (m *monitoring) dockerCommand(args []string) error {
 	return executeHostCommand(m.cmd, "docker", args...)
 }
 
+func (m *monitoring) dockerComposeCommand(args []string) error {
+	finalArgs := args
+	command := "docker"
+
+	if useDockerCompose {
+		command = dockerCompose
+	} else {
+		updatedArgs := []string{"compose"}
+		finalArgs = append(updatedArgs, args...)
+	}
+
+	m.cmd.Printf("Issuing %s %s\n", command, strings.Join(finalArgs, " "))
+
+	return executeHostCommand(m.cmd, command, finalArgs...)
+}
+
 func monitoringNotValid(message string) error {
 	return fmt.Errorf("unable to validate monitoring due to %s, please run 'cohctl init monitoring'", message)
 }
@@ -400,15 +421,16 @@ func monitoringNotValid(message string) error {
 func writeFileContents(base, file string, content []byte) error {
 	destPath := filepath.Join(base, file)
 
-	if err := os.WriteFile(destPath, content, 0600); err != nil {
+	// #nosec G306 -- file is meant to be readable by docker on Linux
+	if err := os.WriteFile(destPath, content, 0644); err != nil {
 		return fmt.Errorf("error writing file %s: %w", destPath, err)
 	}
 
 	return nil
 }
 
 func ensureDirectory(directory string) error {
-	err := utils.EnsureDirectory(directory)
+	err := utils.EnsureDirectoryWithPerms(directory, 0755)
 	if err != nil {
 		return fmt.Errorf("unable to create directory: %s, %v", directory, err)
 	}
@@ -454,4 +476,6 @@ func streamOutput(r io.Reader, w io.Writer) {
 func init() {
 	initMonitoringCmd.Flags().BoolVarP(&automaticallyConfirm, "yes", "y", false, confirmOptionMessage)
 	stopMonitoringCmd.Flags().BoolVarP(&automaticallyConfirm, "yes", "y", false, confirmOptionMessage)
+	stopMonitoringCmd.Flags().BoolVarP(&useDockerCompose, dockerCompose, "D", false, useDockerComposeMessage)
+	startMonitoringCmd.Flags().BoolVarP(&useDockerCompose, dockerCompose, "D", false, useDockerComposeMessage)
 }

pkg/utils/utils.go

@@ -17,6 +17,7 @@ import (
 	"github.com/oracle/coherence-cli/pkg/constants"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -149,9 +150,14 @@ func GetJSONPathResults(jsonData []byte, jsonPath string) (string, error) {
 
 // EnsureDirectory ensures a directory exists and if not then will create it.
 func EnsureDirectory(directory string) error {
+	return EnsureDirectoryWithPerms(directory, 0700)
+}
+
+// EnsureDirectoryWithPerms ensures a directory exists and if not then will create it with specific permissions.
+func EnsureDirectoryWithPerms(directory string, perm fs.FileMode) error {
 	if _, err := os.Stat(directory); err != nil {
 		if os.IsNotExist(err) {
-			err = os.Mkdir(directory, 0700)
+			err = os.Mkdir(directory, perm)
 			if err != nil {
 				return GetError("unable to create directory "+directory, err)
 			}