diff --git a/cmd/headscale/cli/dump_config.go b/cmd/headscale/cli/dump_config.go new file mode 100644 index 00000000..374690ed --- /dev/null +++ b/cmd/headscale/cli/dump_config.go @@ -0,0 +1,28 @@ +package cli + +import ( + "fmt" + + "github.com/spf13/cobra" + "github.com/spf13/viper" +) + +func init() { + rootCmd.AddCommand(dumpConfigCmd) +} + +var dumpConfigCmd = &cobra.Command{ + Use: "dumpConfig", + Short: "dump current config to /etc/headscale/config.dump.yaml, integration test only", + Hidden: true, + Args: func(cmd *cobra.Command, args []string) error { + return nil + }, + Run: func(cmd *cobra.Command, args []string) { + err := viper.WriteConfigAs("/etc/headscale/config.dump.yaml") + if err != nil { + //nolint + fmt.Println("Failed to dump config") + } + }, +} diff --git a/integration_cli_test.go b/integration_cli_test.go index 075c38ac..8ac6ee4d 100644 --- a/integration_cli_test.go +++ b/integration_cli_test.go @@ -1721,3 +1721,43 @@ func (s *IntegrationCLITestSuite) TestNodeMoveCommand() { assert.Equal(s.T(), machine.Namespace, oldNamespace) } + +func (s *IntegrationCLITestSuite) TestLoadConfigFromCommand() { + // TODO: make sure defaultConfig is not same as altConfig + defaultConfig, err := os.ReadFile("integration_test/etc/config.dump.gold.yaml") + assert.Nil(s.T(), err) + altConfig, err := os.ReadFile("integration_test/etc/alt-config.dump.gold.yaml") + assert.Nil(s.T(), err) + + _, err = ExecuteCommand( + &s.headscale, + []string{ + "headscale", + "dumpConfig", + }, + []string{}, + ) + assert.Nil(s.T(), err) + + defaultDumpConfig, err := os.ReadFile("integration_test/etc/config.dump.yaml") + assert.Nil(s.T(), err) + + assert.YAMLEq(s.T(), string(defaultConfig), string(defaultDumpConfig)) + + _, err = ExecuteCommand( + &s.headscale, + []string{ + "headscale", + "-c", + "/etc/headscale/alt-config.yaml", + "dumpConfig", + }, + []string{}, + ) + assert.Nil(s.T(), err) + + altDumpConfig, err := os.ReadFile("integration_test/etc/config.dump.yaml") + assert.Nil(s.T(), err) + + assert.YAMLEq(s.T(), string(altConfig), string(altDumpConfig)) +} diff --git a/integration_test/etc/alt-config.dump.gold.yaml b/integration_test/etc/alt-config.dump.gold.yaml new file mode 100644 index 00000000..7b2fe6ab --- /dev/null +++ b/integration_test/etc/alt-config.dump.gold.yaml @@ -0,0 +1,46 @@ +acl_policy_path: "" +cli: + insecure: false + timeout: 5s +db_path: /tmp/integration_test_db.sqlite3 +db_type: sqlite3 +derp: + auto_update_enabled: false + server: + enabled: false + stun: + enabled: true + update_frequency: 1m + urls: + - https://controlplane.tailscale.com/derpmap/default +dns_config: + base_domain: headscale.net + domains: [] + magic_dns: true + nameservers: + - 1.1.1.1 +ephemeral_node_inactivity_timeout: 30m +grpc_allow_insecure: false +grpc_listen_addr: :50443 +ip_prefixes: + - fd7a:115c:a1e0::/48 + - 100.64.0.0/10 +listen_addr: 0.0.0.0:18080 +log_level: trace +logtail: + enabled: false +metrics_listen_addr: 127.0.0.1:19090 +oidc: + scope: + - openid + - profile + - email + strip_email_domain: true +private_key_path: private.key +server_url: http://headscale:18080 +tls_client_auth_mode: relaxed +tls_letsencrypt_cache_dir: /var/www/.cache +tls_letsencrypt_challenge_type: HTTP-01 +unix_socket: /var/run/headscale.sock +unix_socket_permission: "0o770" + diff --git a/integration_test/etc/alt-config.yaml b/integration_test/etc/alt-config.yaml new file mode 100644 index 00000000..8de9a828 --- /dev/null +++ b/integration_test/etc/alt-config.yaml @@ -0,0 +1,24 @@ +log_level: trace +acl_policy_path: "" +db_type: sqlite3 +ephemeral_node_inactivity_timeout: 30m +ip_prefixes: + - fd7a:115c:a1e0::/48 + - 100.64.0.0/10 +dns_config: + base_domain: headscale.net + magic_dns: true + domains: [] + nameservers: + - 1.1.1.1 +db_path: /tmp/integration_test_db.sqlite3 +private_key_path: private.key +listen_addr: 0.0.0.0:18080 +metrics_listen_addr: 127.0.0.1:19090 +server_url: http://headscale:18080 + +derp: + urls: + - https://controlplane.tailscale.com/derpmap/default + auto_update_enabled: false + update_frequency: 1m diff --git a/integration_test/etc/config.dump.gold.yaml b/integration_test/etc/config.dump.gold.yaml new file mode 100644 index 00000000..d33610d9 --- /dev/null +++ b/integration_test/etc/config.dump.gold.yaml @@ -0,0 +1,46 @@ +acl_policy_path: "" +cli: + insecure: false + timeout: 5s +db_path: /tmp/integration_test_db.sqlite3 +db_type: sqlite3 +derp: + auto_update_enabled: false + server: + enabled: false + stun: + enabled: true + update_frequency: 1m + urls: + - https://controlplane.tailscale.com/derpmap/default +dns_config: + base_domain: headscale.net + domains: [] + magic_dns: true + nameservers: + - 1.1.1.1 +ephemeral_node_inactivity_timeout: 30m +grpc_allow_insecure: false +grpc_listen_addr: :50443 +ip_prefixes: + - fd7a:115c:a1e0::/48 + - 100.64.0.0/10 +listen_addr: 0.0.0.0:8080 +log_level: trace +logtail: + enabled: false +metrics_listen_addr: 127.0.0.1:9090 +oidc: + scope: + - openid + - profile + - email + strip_email_domain: true +private_key_path: private.key +server_url: http://headscale:8080 +tls_client_auth_mode: relaxed +tls_letsencrypt_cache_dir: /var/www/.cache +tls_letsencrypt_challenge_type: HTTP-01 +unix_socket: /var/run/headscale.sock +unix_socket_permission: "0o770" +