Merge pull request cli#147 from cli/wm/entries-should-load-unmodified

Config should load as unmodified
heaths · Jan 23, 2024 · d88d88f · d88d88f
2 parents d32c104 + 25d7c84
commit d88d88f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -23,4 +23,4 @@ jobs:
       - name: Lint
         uses: golangci/golangci-lint-action@v3.4.0
         with:
-          version: v1.52
+          version: v1.54
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -213,6 +213,7 @@ func load(generalFilePath, hostsFilePath string, fallback *Config) (*Config, err
 
 	if hostsMap != nil && !hostsMap.Empty() {
 		generalMap.AddEntry("hosts", hostsMap)
+		generalMap.SetUnmodified()
 	}
 
 	if generalMap.Empty() && fallback != nil {

diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestConfigDir(t *testing.T) {
@@ -624,6 +625,27 @@ func TestSet(t *testing.T) {
 	}
 }
 
+func TestEntriesShouldBeModifiedOnLoad(t *testing.T) {
+	// Given we have a persisted config and hosts file
+	tempDir := t.TempDir()
+	t.Setenv("GH_CONFIG_DIR", tempDir)
+
+	require.NoError(t, writeFile(hostsConfigFile(), []byte(testHostsData())))
+	require.NoError(t, writeFile(generalConfigFile(), []byte(testGlobalData())))
+
+	// When we load that config
+	cfg, err := load(generalConfigFile(), hostsConfigFile(), nil)
+	require.NoError(t, err)
+
+	// Then the general and host entries should be unmodified
+	// because we didn't mutate anything yet
+	require.False(t, cfg.entries.IsModified())
+
+	hosts, err := cfg.entries.FindEntry("hosts")
+	require.NoError(t, err)
+	require.False(t, hosts.IsModified())
+}
+
 func testConfig() *Config {
 	var data = `
 git_protocol: ssh