netdeploy: Add AdminAPIToken to network templates (#5473)

algorand · Jun 22, 2023 · 7a282c8 · 7a282c8
1 parent 227df93
commit 7a282c8
Show file tree

Hide file tree

Showing 13 changed files with 253 additions and 195 deletions.
diff --git a/netdeploy/remote/buildConfig.go b/netdeploy/remote/buildConfig.go
@@ -32,6 +32,7 @@ type BuildConfig struct {
 	APIEndpoint2      string
 	APIEndpoint3      string
 	APIEndpoint4      string
+	AdminAPIToken     string
 	APIToken          string
 	EnableTelemetry   bool
 	TelemetryURI      string

diff --git a/netdeploy/remote/deployedNetwork.go b/netdeploy/remote/deployedNetwork.go
@@ -156,6 +156,7 @@ func replaceTokens(original string, buildConfig BuildConfig) (expanded string, e
 	tokenPairs = append(tokenPairs, "{{APIEndpoint3}}", buildConfig.APIEndpoint3)
 	tokenPairs = append(tokenPairs, "{{APIEndpoint4}}", buildConfig.APIEndpoint4)
 	tokenPairs = append(tokenPairs, "{{APIToken}}", buildConfig.APIToken)
+	tokenPairs = append(tokenPairs, "{{AdminAPIToken}}", buildConfig.AdminAPIToken)
 	tokenPairs = append(tokenPairs, "{{EnableTelemetry}}", strconv.FormatBool(buildConfig.EnableTelemetry))
 	tokenPairs = append(tokenPairs, "{{TelemetryURI}}", buildConfig.TelemetryURI)
 	tokenPairs = append(tokenPairs, "{{MetricsURI}}", buildConfig.MetricsURI)

diff --git a/netdeploy/remote/nodeConfig.go b/netdeploy/remote/nodeConfig.go
@@ -23,6 +23,7 @@ type NodeConfig struct {
 	NetAddress         string `json:",omitempty"`
 	APIEndpoint        string `json:",omitempty"`
 	APIToken           string `json:",omitempty"`
+	AdminAPIToken      string `json:",omitempty"`
 	EnableTelemetry    bool   // Needs to also be configured host-wide (assign logging host name)
 	TelemetryURI       string `json:",omitempty"` // Needs to be HostConfig
 	EnableMetrics      bool   // Needs to also be configured host-wide (register DNS entry)

diff --git a/netdeploy/remote/nodecfg/nodeDir.go b/netdeploy/remote/nodecfg/nodeDir.go
@@ -66,6 +66,10 @@ func (nd *nodeDir) configure() (err error) {
 		fmt.Fprintf(os.Stdout, "Error during configureAPIToken: %s\n", err)
 		return
 	}
+	if err = nd.configureAdminAPIToken(nd.AdminAPIToken); err != nil {
+		fmt.Fprintf(os.Stdout, "Error during configureAdminAPIToken: %s\n", err)
+		return
+	}
 	if err = nd.configureTelemetry(nd.EnableTelemetry); err != nil {
 		fmt.Fprintf(os.Stdout, "Error during configureTelemetry: %s\n", err)
 		return
@@ -181,6 +185,21 @@ func (nd *nodeDir) configureAPIToken(token string) (err error) {
 	return nd.saveConfig()
 }
 
+func (nd *nodeDir) configureAdminAPIToken(token string) (err error) {
+	if token == "" {
+		return
+	}
+	if err = nd.ensureConfig(); err != nil {
+		return
+	}
+	fmt.Fprintf(os.Stdout, " - Assigning AdminAPIToken: %s\n", token)
+	err = os.WriteFile(filepath.Join(nd.dataDir, tokens.AlgodAdminTokenFilename), []byte(token), 0600)
+	if err != nil {
+		return err
+	}
+	return nd.saveConfig()
+}
+
 func (nd *nodeDir) configureTelemetry(enable bool) (err error) {
 	cfg, created, cfgErr := logging.EnsureTelemetryConfigCreated(nil, "")
 	if cfgErr != nil {

diff --git a/test/testdata/deployednettemplates/configs/reference.json b/test/testdata/deployednettemplates/configs/reference.json
@@ -9,6 +9,7 @@
   "APIEndpoint3": ":8582",
   "APIEndpoint4": ":8583",
   "APIToken": "19b3fa5fd63074f3ec7d7052f417c423986472d253eaf275704cbc07adfe64ff",
+  "AdminAPIToken": "19b3fa5fd63074f3ec7d7052f417c423986472d253eaf275704cbc07adfe64ff",
   "EnableTelemetry": true,
   "TelemetryURI": "telemetry.<network>.algodev.network:9105",
   "MetricsURI": "<network>.algodev.network:9106",

diff --git a/test/testdata/deployednettemplates/recipes/baseline/reference.json b/test/testdata/deployednettemplates/recipes/baseline/reference.json
@@ -9,6 +9,7 @@
   "APIEndpoint3": ":8582",
   "APIEndpoint4": ":8583",
   "APIToken": "19b3fa5fd63074f3ec7d7052f417c423986472d253eaf275704cbc07adfe64ff",
+  "AdminAPIToken": "19b3fa5fd63074f3ec7d7052f417c423986472d253eaf275704cbc07adfe64ff",
   "EnableTelemetry": true,
   "TelemetryURI": "telemetry.<network>.algodev.network:9105",
   "MetricsURI": "<network>.algodev.network:9106",

diff --git a/test/testdata/deployednettemplates/recipes/custom/configs/node.json b/test/testdata/deployednettemplates/recipes/custom/configs/node.json
@@ -1,6 +1,7 @@
 {
     "APIEndpoint": "{{APIEndpoint}}",
     "APIToken": "{{APIToken}}",
+    "AdminAPIToken": "{{AdminAPIToken}}",
     "EnableBlockStats": false,
     "EnableTelemetry": false,
     "TelemetryURI": "{{TelemetryURI}}",
@@ -11,6 +12,7 @@
         {
             "APIEndpoint": "{{APIEndpoint}}",
             "APIToken": "{{APIToken}}",
+            "AdminAPIToken": "{{AdminAPIToken}}",
             "EnableBlockStats": true,
             "EnableTelemetry": true,
             "TelemetryURI": "{{TelemetryURI}}",

diff --git a/test/testdata/deployednettemplates/recipes/custom/configs/relay.json b/test/testdata/deployednettemplates/recipes/custom/configs/relay.json
@@ -2,10 +2,11 @@
     "NetAddress": "{{NetworkPort}}",
     "APIEndpoint": "{{APIEndpoint}}",
     "APIToken": "{{APIToken}}",
+    "AdminAPIToken": "{{AdminAPIToken}}",
     "EnableBlockStats": true,
     "EnableTelemetry": true,
     "TelemetryURI": "{{TelemetryURI}}",
     "EnableMetrics": true,
     "MetricsURI": "{{MetricsURI}}",
-    "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \"<network>.algodev.network\", \"DeadlockDetection\": -1, \"EnableIncomingMessageFilter\": true, \"EnableRuntimeMetrics\": true, \"CadaverSizeTarget\": 0, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true }"
+    "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \"<network>.algodev.network\", \"DeadlockDetection\": -1, \"EnableRuntimeMetrics\": true, \"CadaverSizeTarget\": 0, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true }"
 }