-
Notifications
You must be signed in to change notification settings - Fork 135
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(web-modeler): pre-configure Zeebe cluster
- Loading branch information
1 parent
97b781c
commit 74cdda6
Showing
4 changed files
with
194 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -194,6 +194,7 @@ func (s *configmapRestAPITemplateTest) TestContainerShouldSetCorrectKeycloakServ | |
| // then | ||
| s.Require().Equal("http://keycloak:80/auth/realms/camunda-platform", configmapApplication.Camunda.Modeler.Security.JWT.Issuer.BackendUrl) | ||
| } | ||
|
|
||
| func (s *configmapRestAPITemplateTest) TestContainerShouldSetCorrectKeycloakServiceUrlWithCustomPort() { | ||
| // given | ||
| options := &helm.Options{ | ||
|
|
@@ -221,6 +222,7 @@ func (s *configmapRestAPITemplateTest) TestContainerShouldSetCorrectKeycloakServ | |
| // then | ||
| s.Require().Equal("http://keycloak:8888/auth/realms/camunda-platform", configmapApplication.Camunda.Modeler.Security.JWT.Issuer.BackendUrl) | ||
| } | ||
|
|
||
| func (s *configmapRestAPITemplateTest) TestContainerShouldSetSmtpCredentials() { | ||
| // given | ||
| options := &helm.Options{ | ||
|
|
@@ -247,6 +249,7 @@ func (s *configmapRestAPITemplateTest) TestContainerShouldSetSmtpCredentials() { | |
| // then | ||
| s.Require().Equal("modeler-user", configmapApplication.Spring.Mail.Username) | ||
| } | ||
|
|
||
| func (s *configmapRestAPITemplateTest) TestContainerShouldSetExternalDatabaseConfiguration() { | ||
| // given | ||
| options := &helm.Options{ | ||
|
|
@@ -276,3 +279,120 @@ func (s *configmapRestAPITemplateTest) TestContainerShouldSetExternalDatabaseCon | |
| s.Require().Equal("jdbc:postgresql://postgres.example.com:65432/modeler-database", configmapApplication.Spring.Datasource.Url) | ||
| s.Require().Equal("modeler-user", configmapApplication.Spring.Datasource.Username) | ||
| } | ||
|
|
||
| func (s *configmapRestAPITemplateTest) TestContainerShouldSetClusterConfigurationWithDefaultValuesIfZeebeEnabled() { | ||
| // given | ||
| options := &helm.Options{ | ||
| SetValues: map[string]string{ | ||
| "webModeler.enabled": "true", | ||
| "webModeler.restapi.mail.fromAddress": "[email protected]", | ||
| "postgresql.enabled": "false", | ||
| }, | ||
| KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace), | ||
| } | ||
|
|
||
| // when | ||
| output := helm.RenderTemplate(s.T(), options, s.chartPath, s.release, s.templates) | ||
| var configmap corev1.ConfigMap | ||
| var configmapApplication WebModelerRestAPIApplicationYAML | ||
| helm.UnmarshalK8SYaml(s.T(), output, &configmap) | ||
|
|
||
| err := yaml.Unmarshal([]byte(configmap.Data["application.yaml"]), &configmapApplication) | ||
| if err != nil { | ||
| s.Fail("Failed to unmarshal yaml. error=", err) | ||
| } | ||
|
|
||
| // then | ||
| s.Require().Equal(1, len(configmapApplication.Camunda.Modeler.Clusters)) | ||
| s.Require().Equal("camunda-platform-test-zeebe", configmapApplication.Camunda.Modeler.Clusters[0].Name) | ||
| s.Require().Equal("8.6.0", configmapApplication.Camunda.Modeler.Clusters[0].Version) | ||
| s.Require().Equal("OAUTH", configmapApplication.Camunda.Modeler.Clusters[0].Authentication) | ||
| s.Require().Equal("grpc://camunda-platform-test-zeebe-gateway:26500", configmapApplication.Camunda.Modeler.Clusters[0].Url.Zeebe.Grpc) | ||
| s.Require().Equal("http://camunda-platform-test-zeebe-gateway:8080", configmapApplication.Camunda.Modeler.Clusters[0].Url.Zeebe.Rest) | ||
| s.Require().Equal("http://camunda-platform-test-operate:80", configmapApplication.Camunda.Modeler.Clusters[0].Url.Operate) | ||
| s.Require().Equal("http://camunda-platform-test-tasklist:80", configmapApplication.Camunda.Modeler.Clusters[0].Url.Tasklist) | ||
| s.Require().Equal("http://camunda-platform-test-keycloak:80/auth/realms/camunda-platform/protocol/openid-connect/token", configmapApplication.Camunda.Modeler.Clusters[0].Oauth.Url) | ||
| s.Require().Equal("zeebe-api", configmapApplication.Camunda.Modeler.Clusters[0].Oauth.Audience.Zeebe) | ||
| s.Require().Equal("operate-api", configmapApplication.Camunda.Modeler.Clusters[0].Oauth.Audience.Operate) | ||
| s.Require().Equal("tasklist-api", configmapApplication.Camunda.Modeler.Clusters[0].Oauth.Audience.Tasklist) | ||
| s.Require().Equal("", configmapApplication.Camunda.Modeler.Clusters[0].Oauth.Scope) | ||
| } | ||
|
|
||
| func (s *configmapRestAPITemplateTest) TestContainerShouldSetClusterConfigurationWithCustomValuesIfZeebeEnabled() { | ||
| // given | ||
| options := &helm.Options{ | ||
| SetValues: map[string]string{ | ||
| "webModeler.enabled": "true", | ||
| "webModeler.restapi.mail.fromAddress": "[email protected]", | ||
| "postgresql.enabled": "false", | ||
| "global.zeebeClusterName": "test-cluster", | ||
| "global.identity.auth.zeebe.tokenScope": "test-scope", | ||
| "global.identity.auth.zeebe.audience": "test-zeebe-api", | ||
| "global.identity.auth.operate.audience": "test-operate-api", | ||
| "global.identity.auth.tasklist.audience": "test-tasklist-api", | ||
| "global.identity.auth.tokenUrl": "https://example.com/auth/realms/test/protocol/openid-connect/token", | ||
| "zeebe.image.tag": "8.7.0-alpha1", | ||
| "zeebeGateway.contextPath": "/zeebe", | ||
| "zeebeGateway.service.grpcPort": "26600", | ||
| "zeebeGateway.service.restPort": "8090", | ||
| "operate.contextPath": "/operate", | ||
| "operate.service.port": "8080", | ||
| "tasklist.contextPath": "/tasklist", | ||
| "tasklist.service.port": "8080", | ||
| }, | ||
| KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace), | ||
| } | ||
|
|
||
| // when | ||
| output := helm.RenderTemplate(s.T(), options, s.chartPath, s.release, s.templates) | ||
| var configmap corev1.ConfigMap | ||
| var configmapApplication WebModelerRestAPIApplicationYAML | ||
| helm.UnmarshalK8SYaml(s.T(), output, &configmap) | ||
|
|
||
| err := yaml.Unmarshal([]byte(configmap.Data["application.yaml"]), &configmapApplication) | ||
| if err != nil { | ||
| s.Fail("Failed to unmarshal yaml. error=", err) | ||
| } | ||
|
|
||
| // then | ||
| s.Require().Equal(1, len(configmapApplication.Camunda.Modeler.Clusters)) | ||
| s.Require().Equal("test-cluster", configmapApplication.Camunda.Modeler.Clusters[0].Name) | ||
| s.Require().Equal("8.7.0-alpha1", configmapApplication.Camunda.Modeler.Clusters[0].Version) | ||
| s.Require().Equal("OAUTH", configmapApplication.Camunda.Modeler.Clusters[0].Authentication) | ||
| s.Require().Equal("grpc://test-cluster-gateway:26600", configmapApplication.Camunda.Modeler.Clusters[0].Url.Zeebe.Grpc) | ||
| s.Require().Equal("http://test-cluster-gateway:8090/zeebe", configmapApplication.Camunda.Modeler.Clusters[0].Url.Zeebe.Rest) | ||
| s.Require().Equal("http://camunda-platform-test-operate:8080/operate", configmapApplication.Camunda.Modeler.Clusters[0].Url.Operate) | ||
| s.Require().Equal("http://camunda-platform-test-tasklist:8080/tasklist", configmapApplication.Camunda.Modeler.Clusters[0].Url.Tasklist) | ||
| s.Require().Equal("https://example.com/auth/realms/test/protocol/openid-connect/token", configmapApplication.Camunda.Modeler.Clusters[0].Oauth.Url) | ||
| s.Require().Equal("test-zeebe-api", configmapApplication.Camunda.Modeler.Clusters[0].Oauth.Audience.Zeebe) | ||
| s.Require().Equal("test-operate-api", configmapApplication.Camunda.Modeler.Clusters[0].Oauth.Audience.Operate) | ||
| s.Require().Equal("test-tasklist-api", configmapApplication.Camunda.Modeler.Clusters[0].Oauth.Audience.Tasklist) | ||
| s.Require().Equal("test-scope", configmapApplication.Camunda.Modeler.Clusters[0].Oauth.Scope) | ||
| } | ||
|
|
||
| func (s *configmapRestAPITemplateTest) TestContainerShouldNotSetClusterConfigurationIfZeebeDisabled() { | ||
| // given | ||
| options := &helm.Options{ | ||
| SetValues: map[string]string{ | ||
| "webModeler.enabled": "true", | ||
| "webModeler.restapi.mail.fromAddress": "[email protected]", | ||
| "postgresql.enabled": "false", | ||
| "zeebe.enabled": "false", | ||
| }, | ||
| KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace), | ||
| } | ||
|
|
||
| // when | ||
| output := helm.RenderTemplate(s.T(), options, s.chartPath, s.release, s.templates) | ||
| var configmap corev1.ConfigMap | ||
| var configmapApplication WebModelerRestAPIApplicationYAML | ||
| helm.UnmarshalK8SYaml(s.T(), output, &configmap) | ||
|
|
||
| err := yaml.Unmarshal([]byte(configmap.Data["application.yaml"]), &configmapApplication) | ||
| if err != nil { | ||
| s.Fail("Failed to unmarshal yaml. error=", err) | ||
| } | ||
|
|
||
| // then | ||
| s.Require().Empty(configmapApplication.Camunda.Modeler.Clusters) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters