feat(info): add new info properties in cluster and environment info

conplementAG · Nov 28, 2023 · 94a9922 · 94a9922
1 parent 14dd981
commit 94a9922
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/pkg/recipes/copsctl/cluster_info_v1.go b/pkg/recipes/copsctl/cluster_info_v1.go
@@ -4,5 +4,6 @@ package copsctl
 type ClusterInfoV1 struct {
 	Version       string `json:"version"`
 	Description   string `json:"description"`
+	Identifier    string `json:"identifier"`
 	OidcIssuerUrl string `json:"oidc_issuer_url"`
 }
diff --git a/pkg/recipes/copsctl/environment_info_v2.go b/pkg/recipes/copsctl/environment_info_v2.go
@@ -7,19 +7,22 @@ import (
 
 // EnvironmentInfoV2 object is a wrapper over the info environment response in version 2.
 type EnvironmentInfoV2 struct {
-	Version                        string               `json:"version"`
-	Description                    string               `json:"description"`
-	SubscriptionId                 string               `json:"subscription_id"`
-	TenantId                       string               `json:"tenant_id"`
-	EgressStaticOutboundIpsEnabled bool                 `json:"egress_static_outbound_ips_enabled"`
-	EgressStaticOutboundIps        []string             `json:"egress_static_outbound_ips"`
-	TechnicalAccountName           string               `json:"technical_account_name"`
-	TechnicalAccountNamespace      string               `json:"technical_account_namespace"`
-	CoreOpsMonitoringAndLogging    string               `json:"coreops_monitoring_and_logging"`
-	LogAnalyticsWorkspace          string               `json:"log_analytics_workspace"`
-	NetworkingBlue                 Networking           `json:"networking_blue"`
-	NetworkingGreen                Networking           `json:"networking_green"`
-	ApplicationDnsZones            []ApplicationDnsZone `json:"application_dns_zones"`
+	Version                              string               `json:"version"`
+	Description                          string               `json:"description"`
+	SubscriptionId                       string               `json:"subscription_id"`
+	TenantId                             string               `json:"tenant_id"`
+	EgressStaticOutboundIpsEnabled       bool                 `json:"egress_static_outbound_ips_enabled"`
+	EgressStaticOutboundIps              []string             `json:"egress_static_outbound_ips"`
+	TechnicalAccountName                 string               `json:"technical_account_name"`
+	TechnicalAccountNamespace            string               `json:"technical_account_namespace"`
+	CoreOpsMonitoringAndLogging          string               `json:"coreops_monitoring_and_logging"`
+	SecondaryCoreOpsMonitoringAndLogging string               `json:"secondary_coreops_monitoring_and_logging"`
+	LogAnalyticsWorkspace                string               `json:"log_analytics_workspace"`
+	NetworkingBlue                       Networking           `json:"networking_blue"`
+	NetworkingGreen                      Networking           `json:"networking_green"`
+	ApplicationDnsZones                  []ApplicationDnsZone `json:"application_dns_zones"`
+	BaseDomain                           string               `json:"base_domain"`
+	SecondaryBaseDomain                  string               `json:"secondary_base_domain"`
 }
 
 type Networking struct {

diff --git a/pkg/recipes/copsctl/environment_info_v2_test.json b/pkg/recipes/copsctl/environment_info_v2_test.json
@@ -14,6 +14,7 @@
     }
   ],
   "coreops_monitoring_and_logging": "monitoring.local",
+  "secondary_coreops_monitoring_and_logging": "sec.monitoring.local",
   "egress_static_outbound_ips": [
     "1.2.3.4",
     "4.3.2.1"
@@ -92,5 +93,7 @@
   "technical_account_name": "my-technical-account",
   "technical_account_namespace": "my-technical-account-namespace",
   "tenant_id": "00000000-0000-0000-0000-000000000001",
+  "base_domain": "lulu.com",
+  "secondary_base_domain": "sec.lulu.com",
   "version": "2"
 }