fix integration tests

.github/workflows/test.yml

@@ -30,6 +30,6 @@ jobs:
         run: |
           make coverage
         env:
-          FEATKEY : /tmp
+          FEATKEY_DIR : /tmp
           ASC_DOCKER_USER : ${{secrets.DOCKER_USER}}
           ASC_DOCKER_PASS : ${{secrets.DOCKER_PASS}}

README.md

@@ -70,21 +70,21 @@ make unit
 ### Integration Tests
 
 Integration tests require that docker is installed and running.
-A path to an Aerospike feature key file should be defined at the `FEATKEY` environment variable.
+A path to an Aerospike feature key file should be defined at the `FEATKEY_DIR` environment variable.
 For more information about the feature key file see the [feature-key docs](https://docs.aerospike.com/server/operations/configure/feature-key).
 
 ```shell
-FEATKEY=/path/to/aerospike/features.conf make integration
+FEATKEY_DIR=/path/to/aerospike/features/dir make integration
 ```
 
 ### All Tests
 
 ```shell
-FEATKEY=/path/to/aerospike/features.conf make test
+FEATKEY_DIR=/path/to/aerospike/features/dir make test
 ```
 
 ### Test Coverage
 
 ```shell
-FEATKEY=/path/to/aerospike/features.conf make view-coverage
+FEATKEY_DIR=/path/to/aerospike/features/dir make view-coverage
 ```

cmd/convert.go

@@ -4,6 +4,8 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"path/filepath"
+	"strings"
 
 	"github.com/aerospike/aerospike-management-lib/asconfig"
 	"github.com/aerospike/asconfig/conf"
@@ -151,9 +153,23 @@ func newConvertCmd() *cobra.Command {
 				return err
 			}
 
-			err = CheckIsDir(&outputPath, outFmt)
-			if err != nil {
-				return err
+			if stat, err := os.Stat(outputPath); !errors.Is(err, os.ErrNotExist) && stat.IsDir() {
+				// output path is a directory so write a new file to it
+				outFileName := filepath.Base(srcPath)
+				if srcPath == os.Stdin.Name() {
+					outFileName = defaultOutputFileName
+				}
+
+				outFileName = strings.TrimSuffix(outFileName, filepath.Ext(outFileName))
+
+				outputPath = filepath.Join(outputPath, outFileName)
+				if outFmt == conf.YAML {
+					outputPath += ".yaml"
+				} else if outFmt == conf.AsConfig {
+					outputPath += ".conf"
+				} else {
+					return fmt.Errorf("output format unrecognized %w", errInvalidFormat)
+				}
 			}
 
 			var outFile *os.File

cmd/generate.go

@@ -81,12 +81,6 @@ func newGenerateCmd() *cobra.Command {
 				return errors.Join(fmt.Errorf("unable to marshal the generated conf file"), err)
 			}
 
-			err = CheckIsDir(&outputPath, outFormat)
-
-			if err != nil {
-				return err
-			}
-
 			mdata := map[string]string{
 				metaKeyAerospikeVersion: generatedConf.Version,
 				metaKeyAsconfigVersion:  VERSION,
@@ -130,7 +124,7 @@ func newGenerateCmd() *cobra.Command {
 		flags.SetAerospikeFlags(asCommonFlags, flags.DefaultWrapHelpString),
 	)
 	res.Flags().StringP("output", "o", os.Stdout.Name(), flags.DefaultWrapHelpString("File path to write output to"))
-	res.Flags().StringP("format", "F", "conf", "The format of the destination file(s). Valid options are: yaml, yml, and conf.")
+	res.Flags().StringP("format", "F", "conf", flags.DefaultWrapHelpString("The format of the destination file(s). Valid options are: yaml, yml, and conf."))
 
 	return res
 }

cmd/utils.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"errors"
 	"fmt"
-	"os"
 	"path/filepath"
 	"strings"
 
@@ -131,26 +130,3 @@ func ParseFmtString(in string) (f conf.Format, err error) {
 
 	return
 }
-
-func CheckIsDir(outputPath *string, outFormat conf.Format) error {
-	if stat, err := os.Stat(*outputPath); !errors.Is(err, os.ErrNotExist) && stat.IsDir() {
-		// output path is a directory so write a new file to it
-		outFileName := filepath.Base(*outputPath)
-		if *outputPath == os.Stdin.Name() {
-			outFileName = defaultOutputFileName
-		}
-
-		outFileName = strings.TrimSuffix(outFileName, filepath.Ext(outFileName))
-
-		*outputPath = filepath.Join(*outputPath, outFileName)
-		if outFormat == conf.YAML {
-			*outputPath += ".yaml"
-		} else if outFormat == conf.AsConfig {
-			*outputPath += ".conf"
-		} else {
-			return fmt.Errorf("output format unrecognized %w", errInvalidFormat)
-		}
-	}
-
-	return nil
-}

integration_test.go

@@ -29,13 +29,13 @@ import (
 )
 
 const (
-	sourcePath       = "testdata/sources"
-	expectedPath     = "testdata/expected"
-	destinationPath  = "testdata/destinations"
-	coveragePath     = "testdata/coverage/integration"
-	binPath          = "testdata/bin"
-	extraTestPath    = "testdata/cases"
-	tmpServerLogPath = "testdata/tmp_server.log"
+	sourcePath       = "/Users/jesseschmidt/Developer/asconfig/testdata/sources"
+	expectedPath     = "/Users/jesseschmidt/Developer/asconfig/testdata/expected"
+	destinationPath  = "/Users/jesseschmidt/Developer/asconfig/testdata/destinations"
+	coveragePath     = "/Users/jesseschmidt/Developer/asconfig/testdata/coverage/integration"
+	binPath          = "/Users/jesseschmidt/Developer/asconfig/testdata/bin"
+	extraTestPath    = "/Users/jesseschmidt/Developer/asconfig/testdata/cases"
+	tmpServerLogPath = "/Users/jesseschmidt/Developer/asconfig/testdata/tmp_server.log"
 )
 
 var featKeyDir string
@@ -68,10 +68,10 @@ func TestMain(m *testing.M) {
 		panic(err)
 	}
 
-	featKeyDir = os.Getenv("FEATKEY")
+	featKeyDir = os.Getenv("FEATKEY_DIR")
 	fmt.Println(featKeyDir)
 	if featKeyDir == "" {
-		panic("FEATKEY environement variable must be full path to a directory containing valid aerospike feature key files featuresv1.conf and featuresv2.conf of feature key format 1 and 2 respectively.")
+		panic("FEATKEY_DIR environement variable must an absolute path to a directory containing valid aerospike feature key files featuresv1.conf and featuresv2.conf of feature key format 1 and 2 respectively.")
 	}
 
 	code := m.Run()
@@ -311,6 +311,7 @@ func TestYamlToConf(t *testing.T) {
 		if !tf.SkipServerTest {
 			version := getVersion(tf.Arguments)
 			id := runServer(version, confPath, dockerClient, t, tf)
+			time.Sleep(time.Second * 1000)
 
 			time.Sleep(time.Second * 3) // need this to allow logs to accumulate
 
@@ -478,10 +479,6 @@ func runServer(version string, confPath string, dockerClient *client.Client, t *
 	}
 
 	return id
-
-	// need this to allow logs to accumulate
-	time.Sleep(time.Second * 3)
-
 }
 
 func stopServer(id string, dockerClient *client.Client) error {
@@ -716,7 +713,7 @@ func TestConfToYaml(t *testing.T) {
 			version := getVersion(tf.Arguments)
 			id := runServer(version, finalConfPath, dockerClient, t, tf)
 
-			time.Sleep(3) // need this to allow logs to accumulate
+			time.Sleep(time.Second * 3) // need this to allow logs to accumulate
 
 			stopServer(id, dockerClient)
 			checkContainerLogs(id, t, tf, tmpServerLogPath)

testdata/cases/server70/conf-tests.json

@@ -1 +1,11 @@
-[{"Source":"testdata/cases/server70/server70.conf","Destination":"testdata/cases/server70/server70-res-.yaml","Expected":"testdata/cases/server70/server70.yaml","Arguments":["convert","--aerospike-version","7.0.0","--format","asconfig","--output","testdata/cases/server70/server70-res-.yaml"],"SkipServerTest":false,"ServerErrorAllowList":null,"ServerImage":"aerospike.jfrog.io/docker-remote/aerospike/aerospike-server-enterprise-rc:7.0.0.0-rc3","DockerAuth":{"Username":"ASC_DOCKER_USER","Password":"ASC_DOCKER_PASS"}}]
+[
+    {
+        "Source":"testdata/cases/server70/server70.conf",
+        "Destination":"testdata/cases/server70/server70-res-.yaml",
+        "Expected":"testdata/cases/server70/server70.yaml",
+        "Arguments":["convert","--aerospike-version","7.0.0","--format","asconfig","--output","testdata/cases/server70/server70-res-.yaml"],
+        "SkipServerTest":false,
+        "ServerErrorAllowList":null,
+        "ServerImage":"aerospike.jfrog.io/docker-remote/aerospike/aerospike-server-enterprise:7.0.0.3"
+    }
+]

testdata/cases/server70/yaml-tests.json

@@ -1 +1,11 @@
-[{"Source":"testdata/cases/server70/server70.yaml","Destination":"testdata/cases/server70/server70-res-.conf","Expected":"testdata/cases/server70/server70.conf","Arguments":["convert","--aerospike-version","7.0.0","--format","yaml","--output","testdata/cases/server70/server70-res-.conf"],"SkipServerTest":false,"ServerErrorAllowList":null,"ServerImage":"aerospike.jfrog.io/docker-remote/aerospike/aerospike-server-enterprise-rc:7.0.0.0-rc3","DockerAuth":{"Username":"ASC_DOCKER_USER","Password":"ASC_DOCKER_PASS"}}]
+[
+    {
+        "Source":"testdata/cases/server70/server70.yaml",
+        "Destination":"testdata/cases/server70/server70-res-.conf",
+        "Expected":"testdata/cases/server70/server70.conf",
+        "Arguments":["convert","--aerospike-version","7.0.0","--format","yaml","--output","testdata/cases/server70/server70-res-.conf"],
+        "SkipServerTest":false,
+        "ServerErrorAllowList":null,
+        "ServerImage":"aerospike.jfrog.io/docker-remote/aerospike/aerospike-server-enterprise:7.0.0.3"
+    }
+]