WIP: support for fetch --detect-offline-config

internal/exec/engine.go

@@ -24,6 +24,8 @@ import (
 	"os"
 	"time"
 
+	"github.com/coreos/ignition/v2/internal/providers/file"
+
 	"github.com/coreos/ignition/v2/config"
 	"github.com/coreos/ignition/v2/config/shared/errors"
 	latest "github.com/coreos/ignition/v2/config/v3_1_experimental"
@@ -54,6 +56,8 @@ type Engine struct {
 	Root           string
 	PlatformConfig platform.Config
 	Fetcher        *resource.Fetcher
+
+	DetectOfflineConfig string
 }
 
 // Run executes the stage of the given name. It returns true if the stage
@@ -67,6 +71,26 @@ func (e Engine) Run(stageName string) error {
 		Ignition: types.Ignition{Version: types.MaxVersion.String()},
 	}
 
+	if stageName == "fetch" && e.DetectOfflineConfig != "" {
+		var haveConfig bool
+		// If we already have a config cache, we're done
+		if _, err := os.Stat(e.ConfigCache); err != nil {
+			haveConfig = true
+		} else {
+			haveConfig, err = e.detectOfflineConfig()
+			if err != nil {
+				return err
+			}
+		}
+		if haveConfig {
+			if err := ioutil.WriteFile(e.DetectOfflineConfig, []byte{}, 0644); err != nil {
+				return err
+			}
+		}
+		// Note early return
+		return nil
+	}
+
 	systemBaseConfig, r, err := system.FetchBaseConfig(e.Logger)
 	e.logReport(r)
 	if err != nil && err != providers.ErrNoProvider {
@@ -175,6 +199,26 @@ func (e *Engine) acquireConfig() (cfg types.Config, err error) {
 	return
 }
 
+// acquireConfigOffline only looks at config providers which do not
+// require networking.
+func (e *Engine) detectOfflineConfig() (bool, error) {
+	offlineFetchers := []providers.FuncDetectConfig{
+		cmdline.DetectConfig,
+		file.DetectConfig,
+	}
+
+	for _, fetcher := range offlineFetchers {
+		exists, err := fetcher(e.Fetcher)
+		if err != nil {
+			return false, err
+		}
+		if exists {
+			return true, nil
+		}
+	}
+	return false, nil
+}
+
 // fetchProviderConfig returns the externally-provided configuration. It first
 // checks to see if the command-line option is present. If so, it uses that
 // source for the configuration. If the command-line option is not present, it

internal/main.go

@@ -42,11 +42,14 @@ func main() {
 		stage        stages.Name
 		version      bool
 		logToStdout  bool
+
+		detectOfflineConfig string
 	}{}
 
 	flag.BoolVar(&flags.clearCache, "clear-cache", false, "clear any cached config")
 	flag.StringVar(&flags.configCache, "config-cache", "/run/ignition.json", "where to cache the config")
 	flag.DurationVar(&flags.fetchTimeout, "fetch-timeout", exec.DefaultFetchTimeout, "initial duration for which to wait for config")
+	flag.StringVar(&flags.detectOfflineConfig, "detect-config-provided", "", "If a config is provided, create a file at this path")
 	flag.Var(&flags.platform, "platform", fmt.Sprintf("current platform. %v", platform.Names()))
 	flag.StringVar(&flags.root, "root", "/", "root of the filesystem")
 	flag.Var(&flags.stage, "stage", fmt.Sprintf("execution stage. %v", stages.Names()))
@@ -95,6 +98,8 @@ func main() {
 		ConfigCache:    flags.configCache,
 		PlatformConfig: platformConfig,
 		Fetcher:        &fetcher,
+
+		DetectOfflineConfig: flags.detectOfflineConfig,
 	}
 
 	err = engine.Run(flags.stage.String())

internal/providers/cmdline/cmdline.go

@@ -36,6 +36,14 @@ const (
 	cmdlineUrlFlag = "ignition.config.url"
 )
 
+func DetectConfig(f *resource.Fetcher) (bool, error) {
+	url, err := readCmdline(f.Logger)
+	if err != nil {
+		return false, err
+	}
+	return url != nil, nil
+}
+
 func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
 	url, err := readCmdline(f.Logger)
 	if err != nil {

internal/providers/file/file.go

@@ -30,12 +30,29 @@ const (
 	defaultFilename   = "config.ign"
 )
 
-func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
+func getPath(f *resource.Fetcher) string {
 	filename := os.Getenv(cfgFilenameEnvVar)
 	if filename == "" {
 		filename = defaultFilename
 		f.Logger.Info("using default filename")
 	}
+	return filename
+}
+
+func DetectConfig(f *resource.Fetcher) (bool, error) {
+	filename := getPath(f)
+	_, err := os.Stat(filename)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return false, nil
+		}
+		return false, err
+	}
+	return true, nil
+}
+
+func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
+	filename := getPath(f)
 	f.Logger.Info("using config file at %q", filename)
 
 	rawConfig, err := ioutil.ReadFile(filename)

internal/providers/providers.go

@@ -28,6 +28,7 @@ var (
 	ErrNoProvider = errors.New("config provider was not online")
 )
 
+type FuncDetectConfig func(f *resource.Fetcher) (bool, error)
 type FuncFetchConfig func(f *resource.Fetcher) (types.Config, report.Report, error)
 type FuncNewFetcher func(logger *log.Logger) (resource.Fetcher, error)
 type FuncPostStatus func(stageName string, f resource.Fetcher, e error) error