adding configuration option cloud.scada_address (#14936)

* adding scada_address

* config tests

* add changelog entry

.changelog/14936.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+agent: Added configuration option cloud.scada_address.
+```

agent/config/builder.go

@@ -2459,6 +2459,7 @@ func (b *builder) cloudConfigVal(v *CloudConfigRaw) (val hcpconfig.CloudConfig)
 	val.ClientSecret = stringVal(v.ClientSecret)
 	val.AuthURL = stringVal(v.AuthURL)
 	val.Hostname = stringVal(v.Hostname)
+	val.ScadaAddress = stringVal(v.ScadaAddress)
 
 	return val
 }

agent/config/config.go

@@ -866,6 +866,7 @@ type CloudConfigRaw struct {
 	ClientSecret *string `mapstructure:"client_secret"`
 	Hostname     *string `mapstructure:"hostname"`
 	AuthURL      *string `mapstructure:"auth_url"`
+	ScadaAddress *string `mapstructure:"scada_address"`
 }
 
 type TLSProtocolConfig struct {

agent/config/runtime_test.go

@@ -5996,6 +5996,7 @@ func TestLoad_FullConfig(t *testing.T) {
 			ClientSecret: "lCSMHOpB",
 			Hostname:     "DH4bh7aC",
 			AuthURL:      "332nCdR2",
+			ScadaAddress: "aoeusth232",
 		},
 		DNSAddrs:                         []net.Addr{tcpAddr("93.95.95.81:7001"), udpAddr("93.95.95.81:7001")},
 		DNSARecordLimit:                  29907,

agent/config/testdata/TestRuntimeConfig_Sanitize.golden

@@ -129,7 +129,8 @@
         "ClientID": "id",
         "ClientSecret": "hidden",
         "Hostname": "",
-        "ResourceID": "cluster1"
+        "ResourceID": "cluster1",
+        "ScadaAddress": ""
     },
     "ConfigEntryBootstrap": [],
     "ConnectCAConfig": {},
@@ -479,4 +480,4 @@
     "VersionMetadata": "",
     "VersionPrerelease": "",
     "Watches": []
-}
+}

agent/config/testdata/full-config.hcl

@@ -207,6 +207,7 @@ cloud {
     client_secret = "lCSMHOpB"
     hostname = "DH4bh7aC"
     auth_url = "332nCdR2"
+    scada_address = "aoeusth232"
 }
 connect {
     ca_provider = "consul"

agent/config/testdata/full-config.json

@@ -208,7 +208,8 @@
     "client_id": "6WvsDZCP",
     "client_secret":  "lCSMHOpB",
     "hostname":  "DH4bh7aC",
-    "auth_url": "332nCdR2"
+    "auth_url": "332nCdR2",
+    "scada_address": "aoeusth232"
   },
   "connect": {
     "ca_provider": "consul",

agent/hcp/config/config.go

@@ -13,6 +13,7 @@ type CloudConfig struct {
 	ClientSecret string
 	Hostname     string
 	AuthURL      string
+	ScadaAddress string
 }
 
 func (c *CloudConfig) HCPConfig(opts ...hcpcfg.HCPConfigOption) (hcpcfg.HCPConfig, error) {
@@ -25,6 +26,9 @@ func (c *CloudConfig) HCPConfig(opts ...hcpcfg.HCPConfigOption) (hcpcfg.HCPConfi
 	if c.Hostname != "" {
 		opts = append(opts, hcpcfg.WithAPI(c.Hostname, &tls.Config{}))
 	}
+	if c.ScadaAddress != "" {
+		opts = append(opts, hcpcfg.WithSCADA(c.ScadaAddress, &tls.Config{}))
+	}
 	opts = append(opts, hcpcfg.FromEnv())
 	return hcpcfg.NewHCPConfig(opts...)
 }