runtime: unify generated config

We don't need to maintain two generated config.go and even have
duplicates between them.

Signed-off-by: Peng Tao <bergwolf@hyper.sh>

src/runtime/pkg/katautils/config-settings.go.in

@@ -1,5 +1,6 @@
 // Copyright (c) 2018 Intel Corporation
 // Copyright (c) 2018 HyperHQ Inc.
+// Copyright (c) 2021 Ant Group
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -8,6 +9,35 @@
 
 package katautils
 
+// name is the name of the runtime
+var NAME = "@RUNTIME_NAME@"
+
+// name of the project
+const PROJECT = "@PROJECT_NAME@"
+
+// prefix used to denote non-standard CLI commands and options.
+const PROJECTPREFIX = "@PROJECT_TYPE@"
+
+// original URL for this project
+const PROJECTURL = "@PROJECT_URL@"
+
+// Project URL's organisation name
+const PROJECTORG = "@PROJECT_ORG@"
+
+const DEFAULTROOTDIRECTORY = "@PKGRUNDIR@"
+
+// commit is the git commit the runtime is compiled from.
+var COMMIT = "@COMMIT@"
+
+// version is the runtime version.
+var VERSION = "@VERSION@"
+
+// Default config file used by stateless systems.
+var DEFAULTRUNTIMECONFIGURATION = "@CONFIG_PATH@"
+
+// Alternate config file that takes precedence over
+// defaultRuntimeConfiguration.
+var DEFAULTSYSCONFRUNTIMECONFIGURATION = "@SYSCONFIG@"
 var defaultHypervisorPath = "/usr/bin/qemu-system-x86_64"
 var defaultHypervisorCtlPath = "/usr/bin/acrnctl"
 var defaultJailerPath = "/usr/bin/jailer"
@@ -65,9 +95,4 @@ const defaultVMCacheEndpoint string = "/var/run/kata-containers/cache.sock"
 // Default config file used by stateless systems.
 var defaultRuntimeConfiguration = "@CONFIG_PATH@"
 
-// Alternate config file that takes precedence over
-// defaultRuntimeConfiguration.
-var defaultSysConfRuntimeConfiguration = "@SYSCONFIG@"
-
-var name = "kata"
 var defaultNetmonPath = "/usr/libexec/kata-containers/kata-netmon"

src/runtime/pkg/katautils/config.go

@@ -1343,7 +1343,7 @@ func checkHypervisorConfig(config vc.HypervisorConfig) error {
 func GetDefaultConfigFilePaths() []string {
 	return []string{
 		// normally below "/etc"
-		defaultSysConfRuntimeConfiguration,
+		DEFAULTSYSCONFRUNTIMECONFIGURATION,
 
 		// normally below "/usr/share"
 		defaultRuntimeConfiguration,
@@ -1371,7 +1371,7 @@ func getDefaultConfigFile() (string, error) {
 // SetConfigOptions will override some of the defaults settings.
 func SetConfigOptions(n, runtimeConfig, sysRuntimeConfig string) {
 	if n != "" {
-		name = n
+		NAME = n
 	}
 
 	if runtimeConfig != "" {
@@ -1379,6 +1379,6 @@ func SetConfigOptions(n, runtimeConfig, sysRuntimeConfig string) {
 	}
 
 	if sysRuntimeConfig != "" {
-		defaultSysConfRuntimeConfiguration = sysRuntimeConfig
+		DEFAULTSYSCONFRUNTIMECONFIGURATION = sysRuntimeConfig
 	}
 }

src/runtime/pkg/katautils/config_test.go

@@ -250,7 +250,7 @@ func testLoadConfiguration(t *testing.T, dir string,
 
 			// override
 			defaultRuntimeConfiguration = testConfig.ConfigPath
-			defaultSysConfRuntimeConfiguration = ""
+			DEFAULTSYSCONFRUNTIMECONFIGURATION = ""
 
 			for _, file := range configFiles {
 				var err error
@@ -1193,24 +1193,24 @@ func TestGetDefaultConfigFile(t *testing.T) {
 	assert.NoError(err)
 
 	savedConf := defaultRuntimeConfiguration
-	savedSysConf := defaultSysConfRuntimeConfiguration
+	savedSysConf := DEFAULTSYSCONFRUNTIMECONFIGURATION
 
 	defaultRuntimeConfiguration = confDirConfig.ConfigPath
-	defaultSysConfRuntimeConfiguration = sysConfDirConfig.ConfigPath
+	DEFAULTSYSCONFRUNTIMECONFIGURATION = sysConfDirConfig.ConfigPath
 
 	defer func() {
 		defaultRuntimeConfiguration = savedConf
-		defaultSysConfRuntimeConfiguration = savedSysConf
+		DEFAULTSYSCONFRUNTIMECONFIGURATION = savedSysConf
 
 	}()
 
 	got, err := getDefaultConfigFile()
 	assert.NoError(err)
-	// defaultSysConfRuntimeConfiguration has priority over defaultRuntimeConfiguration
-	assert.Equal(got, defaultSysConfRuntimeConfiguration)
+	// DEFAULTSYSCONFRUNTIMECONFIGURATION has priority over defaultRuntimeConfiguration
+	assert.Equal(got, DEFAULTSYSCONFRUNTIMECONFIGURATION)
 
 	// force defaultRuntimeConfiguration to be returned
-	os.Remove(defaultSysConfRuntimeConfiguration)
+	os.Remove(DEFAULTSYSCONFRUNTIMECONFIGURATION)
 
 	got, err = getDefaultConfigFile()
 	assert.NoError(err)

src/runtime/pkg/katautils/create_test.go

@@ -161,7 +161,7 @@ func findLastParam(key string, params []vc.Param) (string, error) {
 		}
 	}
 
-	return "", fmt.Errorf("no param called %q found", name)
+	return "", fmt.Errorf("no param called %q found", NAME)
 }
 
 func TestSetEphemeralStorageType(t *testing.T) {

src/runtime/pkg/katautils/logger.go

@@ -61,7 +61,7 @@ func (h *sysLogHook) Fire(e *logrus.Entry) (err error) {
 }
 
 func newSystemLogHook(network, raddr string) (*sysLogHook, error) {
-	hook, err := lSyslog.NewSyslogHook(network, raddr, syslog.LOG_INFO, name)
+	hook, err := lSyslog.NewSyslogHook(network, raddr, syslog.LOG_INFO, NAME)
 	if err != nil {
 		return nil, err
 	}

src/runtime/pkg/katautils/utils_test.go

@@ -45,7 +45,7 @@ func init() {
 	var err error
 
 	fmt.Printf("INFO: creating test directory\n")
-	testDir, err = ioutil.TempDir("", fmt.Sprintf("%s-", name))
+	testDir, err = ioutil.TempDir("", fmt.Sprintf("%s-", NAME))
 	if err != nil {
 		panic(fmt.Sprintf("ERROR: failed to create test directory: %v", err))
 	}