Skip to content

Commit c769075

Browse files
authored
[CLI-3513] Temporarily remove Confluent Control Center from confluent local services (#3074)
1 parent 71527dd commit c769075

28 files changed

+18
-182
lines changed

cmd/docs/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func createTemporaryConfluentHome() (string, error) {
114114
return "", err
115115
}
116116

117-
path := filepath.Join(dir, "share/java/confluent-control-center/control-center-0.0.0.jar")
117+
path := filepath.Join(dir, "share/java/confluent-rebalancer/confluent-rebalancer-0.0.0.jar")
118118

119119
if err := os.MkdirAll(filepath.Dir(path), 0777); err != nil {
120120
return "", err

internal/local/command_services.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ var (
3939
isConfluentPlatformOnly: false,
4040
envPrefix: "CONNECT",
4141
},
42-
"control-center": {
42+
/*"control-center": {
4343
startDependencies: []string{
4444
"zookeeper",
4545
"kafka",
@@ -51,13 +51,13 @@ var (
5151
port: 9021,
5252
isConfluentPlatformOnly: true,
5353
envPrefix: "CONTROL_CENTER",
54-
},
54+
},*/
5555
"kafka": {
5656
startDependencies: []string{
5757
"zookeeper",
5858
},
5959
stopDependencies: []string{
60-
"control-center",
60+
//"control-center",
6161
"ksql-server",
6262
"connect",
6363
"kafka-rest",
@@ -102,7 +102,7 @@ var (
102102
"zookeeper": {
103103
startDependencies: []string{},
104104
stopDependencies: []string{
105-
"control-center",
105+
//"control-center",
106106
"ksql-server",
107107
"connect",
108108
"kafka-rest",
@@ -122,7 +122,7 @@ var (
122122
"kafka-rest",
123123
"connect",
124124
"ksql-server",
125-
"control-center",
125+
//"control-center",
126126
}
127127
)
128128

internal/local/command_services_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ func TestGetConnectConfig(t *testing.T) {
2828
req.Equal(exampleFile, os.Getenv("CLASSPATH"))
2929
}
3030

31-
func TestGetControlCenterConfig(t *testing.T) {
31+
/*func TestGetControlCenterConfig(t *testing.T) {
3232
want := map[string]string{
3333
"confluent.controlcenter.data.dir": exampleDir,
3434
}
3535
testGetConfig(t, "control-center", want)
36-
}
36+
}*/
3737

3838
func TestGetKafkaConfig(t *testing.T) {
3939
want := map[string]string{
@@ -134,7 +134,7 @@ func TestConfluentPlatformAvailableServices(t *testing.T) {
134134
"kafka-rest",
135135
"connect",
136136
"ksql-server",
137-
"control-center",
137+
//"control-center",
138138
}
139139
req.Equal(want, got)
140140
}

pkg/local/confluent_home.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,9 @@ func (ch *ConfluentHomeManager) FindFile(pattern string) ([]string, error) {
140140
}
141141

142142
func (ch *ConfluentHomeManager) IsConfluentPlatform() (bool, error) {
143-
controlCenter := "share/java/confluent-control-center/control-center-*.jar"
144-
files, err := ch.FindFile(controlCenter)
143+
// check for rebalancer because it is enterprise only
144+
rebalancer := "share/java/confluent-rebalancer/confluent-rebalancer-*.jar"
145+
files, err := ch.FindFile(rebalancer)
145146
if err != nil {
146147
return false, err
147148
}

pkg/local/confluent_home_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func (s *ConfluentHomeTestSuite) TestHasFile() {
7373
func (s *ConfluentHomeTestSuite) TestIsConfluentPlatform() {
7474
req := require.New(s.T())
7575

76-
file := "share/java/confluent-control-center/control-center-0.0.0.jar"
76+
file := "share/java/confluent-rebalancer/confluent-rebalancer-0.0.0.jar"
7777
req.NoError(s.createTestConfluentFile(file))
7878

7979
isCP, err := s.ch.IsConfluentPlatform()

test/fixtures/output/local/destroy.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ The local commands are intended for a single-node development environment only,
22
As of Confluent Platform 8.0, Java 8 will no longer be supported.
33

44
Using CONFLUENT_CURRENT: .+confluent.\d{6}
5-
Control Center is \[DOWN\]
65
ksqlDB Server is \[DOWN\]
76
Connect is \[DOWN\]
87
Kafka REST is \[DOWN\]

test/fixtures/output/local/services/control-center/help-onprem.golden

Lines changed: 0 additions & 19 deletions
This file was deleted.

test/fixtures/output/local/services/control-center/help.golden

Lines changed: 0 additions & 19 deletions
This file was deleted.

test/fixtures/output/local/services/control-center/log-help-onprem.golden

Lines changed: 0 additions & 12 deletions
This file was deleted.

test/fixtures/output/local/services/control-center/log-help.golden

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)