diff --git a/internal/flink/command_application.go b/internal/flink/command_application.go index bb93f4915b..3703d5fdf1 100644 --- a/internal/flink/command_application.go +++ b/internal/flink/command_application.go @@ -5,10 +5,9 @@ import ( ) type flinkApplicationSummaryOut struct { - Name string `human:"Name" serialized:"name"` - Environment string `human:"Environment" serialized:"environment"` - JobName string `human:"Job Name" serialized:"job_name"` - JobStatus string `human:"Job Status" serialized:"job_status"` + Name string `human:"Name" serialized:"name"` + JobName string `human:"Job Name" serialized:"job_name"` + JobStatus string `human:"Job Status" serialized:"job_status"` } func (c *command) newApplicationCommand() *cobra.Command { diff --git a/internal/flink/command_application_list.go b/internal/flink/command_application_list.go index 2ef9634737..4a81b4b91e 100644 --- a/internal/flink/command_application_list.go +++ b/internal/flink/command_application_list.go @@ -45,7 +45,7 @@ func (c *command) applicationList(cmd *cobra.Command, _ []string) error { if output.GetFormat(cmd) == output.Human { list := output.NewList(cmd) for _, app := range applications { - appSummary := populateFlinkApplicationSummaryOut(app, environment) + appSummary := populateFlinkApplicationSummaryOut(app) list.Add(appSummary) } return list.Print() @@ -54,20 +54,18 @@ func (c *command) applicationList(cmd *cobra.Command, _ []string) error { return output.SerializedOutput(cmd, applications) } -func populateFlinkApplicationSummaryOut(application cmfsdk.Application, envFromFlag string) *flinkApplicationSummaryOut { +func populateFlinkApplicationSummaryOut(application cmfsdk.Application) *flinkApplicationSummaryOut { var appSummary *flinkApplicationSummaryOut var jobStatus map[string]any = getOrDefault(application.Status, "jobStatus", map[string]any{}) jobNameString := getOrDefault(jobStatus, "jobName", "") jobStatusString := getOrDefault(jobStatus, "state", "") name := getOrDefault(application.Metadata, "name", "") - environment := getOrDefault(application.Spec, "flinkEnvironment", envFromFlag) appSummary = &flinkApplicationSummaryOut{ - Name: name, - Environment: environment, - JobName: jobNameString, - JobStatus: jobStatusString, + Name: name, + JobName: jobNameString, + JobStatus: jobStatusString, } return appSummary diff --git a/test/fixtures/output/flink/application/describe-success-yaml.golden b/test/fixtures/output/flink/application/describe-success-yaml.golden index 985e67d7f4..a04104add4 100644 --- a/test/fixtures/output/flink/application/describe-success-yaml.golden +++ b/test/fixtures/output/flink/application/describe-success-yaml.golden @@ -7,7 +7,6 @@ spec: metrics.reporter.prom.factory.class: org.apache.flink.metrics.prometheus.PrometheusReporterFactory metrics.reporter.prom.port: 9249-9250 taskmanager.numberOfTaskSlots: "8" - flinkEnvironmentName: default flinkVersion: v1_19 image: confluentinc/cp-flink:1.19.1-cp1 job: diff --git a/test/fixtures/output/flink/application/describe-success.golden b/test/fixtures/output/flink/application/describe-success.golden index a8ef879eeb..1fdc7c0485 100644 --- a/test/fixtures/output/flink/application/describe-success.golden +++ b/test/fixtures/output/flink/application/describe-success.golden @@ -10,7 +10,6 @@ "metrics.reporter.prom.port": "9249-9250", "taskmanager.numberOfTaskSlots": "8" }, - "flinkEnvironmentName": "default", "flinkVersion": "v1_19", "image": "confluentinc/cp-flink:1.19.1-cp1", "job": { diff --git a/test/fixtures/output/flink/application/list-human.golden b/test/fixtures/output/flink/application/list-human.golden index 308aa0cf09..81c45eb0a2 100644 --- a/test/fixtures/output/flink/application/list-human.golden +++ b/test/fixtures/output/flink/application/list-human.golden @@ -1,4 +1,4 @@ - Name | Environment | Job Name | Job Status -------------------------+-------------+-------------------+-------------- - default-application-1 | default | State machine job | RECONCILING - default-application-2 | default | State machine job | RECONCILING + Name | Job Name | Job Status +------------------------+-------------------+-------------- + default-application-1 | State machine job | RECONCILING + default-application-2 | State machine job | RECONCILING diff --git a/test/fixtures/output/flink/application/list-json.golden b/test/fixtures/output/flink/application/list-json.golden index e4cd405db1..4ad97a6f63 100644 --- a/test/fixtures/output/flink/application/list-json.golden +++ b/test/fixtures/output/flink/application/list-json.golden @@ -11,7 +11,6 @@ "metrics.reporter.prom.port": "9249-9250", "taskmanager.numberOfTaskSlots": "8" }, - "flinkEnvironmentName": "default", "flinkVersion": "v1_19", "image": "confluentinc/cp-flink:1.19.1-cp1", "job": { @@ -93,7 +92,6 @@ "metrics.reporter.prom.port": "9249-9250", "taskmanager.numberOfTaskSlots": "8" }, - "flinkEnvironmentName": "default", "flinkVersion": "v1_19", "image": "confluentinc/cp-flink:1.19.1-cp1", "job": { diff --git a/test/fixtures/output/flink/application/list-success-human-missing-attribute.golden b/test/fixtures/output/flink/application/list-success-human-missing-attribute.golden index 82d2cb1a87..33c599273b 100644 --- a/test/fixtures/output/flink/application/list-success-human-missing-attribute.golden +++ b/test/fixtures/output/flink/application/list-success-human-missing-attribute.golden @@ -1,3 +1,3 @@ - Name | Environment | Job Name | Job Status -----------------------+-------------+----------+------------- - new-env-application | new-env | | + Name | Job Name | Job Status +----------------------+----------+------------- + new-env-application | | diff --git a/test/fixtures/output/flink/application/list-success-json-missing-attribute.golden b/test/fixtures/output/flink/application/list-success-json-missing-attribute.golden index 2256d71d52..05b26019f4 100644 --- a/test/fixtures/output/flink/application/list-success-json-missing-attribute.golden +++ b/test/fixtures/output/flink/application/list-success-json-missing-attribute.golden @@ -11,7 +11,6 @@ "metrics.reporter.prom.port": "9249-9250", "taskmanager.numberOfTaskSlots": "8" }, - "flinkEnvironmentName": "new-env", "flinkVersion": "v1_19", "image": "confluentinc/cp-flink:1.19.1-cp1", "job": { diff --git a/test/fixtures/output/flink/application/list-success-yaml-missing-attribute.golden b/test/fixtures/output/flink/application/list-success-yaml-missing-attribute.golden index a0cb83e8e7..6e6f9ce520 100644 --- a/test/fixtures/output/flink/application/list-success-yaml-missing-attribute.golden +++ b/test/fixtures/output/flink/application/list-success-yaml-missing-attribute.golden @@ -7,7 +7,6 @@ metrics.reporter.prom.factory.class: org.apache.flink.metrics.prometheus.PrometheusReporterFactory metrics.reporter.prom.port: 9249-9250 taskmanager.numberOfTaskSlots: "8" - flinkEnvironmentName: new-env flinkVersion: v1_19 image: confluentinc/cp-flink:1.19.1-cp1 job: diff --git a/test/fixtures/output/flink/application/update-successful.golden b/test/fixtures/output/flink/application/update-successful.golden index d65aa0aa09..27e2b99940 100644 --- a/test/fixtures/output/flink/application/update-successful.golden +++ b/test/fixtures/output/flink/application/update-successful.golden @@ -10,7 +10,6 @@ "metrics.reporter.prom.port": "9249-9250", "taskmanager.numberOfTaskSlots": "8" }, - "flinkEnvironmentName": "default", "flinkVersion": "v1_19", "image": "confluentinc/cp-flink:1.19.1-cp1", "job": { diff --git a/test/test-server/flink_onprem_handler.go b/test/test-server/flink_onprem_handler.go index 714cdf2c08..8de3d6fb63 100644 --- a/test/test-server/flink_onprem_handler.go +++ b/test/test-server/flink_onprem_handler.go @@ -24,9 +24,8 @@ func createApplication(name string, environment string) cmfsdk.Application { "name": name, }, Spec: map[string]interface{}{ - "flinkEnvironmentName": environment, - "image": "confluentinc/cp-flink:1.19.1-cp1", - "flinkVersion": "v1_19", + "image": "confluentinc/cp-flink:1.19.1-cp1", + "flinkVersion": "v1_19", "flinkConfiguration": map[string]interface{}{ "taskmanager.numberOfTaskSlots": "8", "metrics.reporter.prom.factory.class": "org.apache.flink.metrics.prometheus.PrometheusReporterFactory", @@ -255,7 +254,6 @@ func handleCmfApplications(t *testing.T) http.HandlerFunc { // for new-env, return an application where some of the fields are missing. if environment == "new-env" && page == "0" { newApplication := createApplication("new-env-application", "new-env") - delete(newApplication.Spec, "flinkEnvironment") delete(newApplication.Status["jobStatus"].(map[string]interface{}), "jobName") delete(newApplication.Status["jobStatus"].(map[string]interface{}), "state") items := []cmfsdk.Application{newApplication}