Updated SSB workshop to CSA 1.7.0.1 and fixed a few issues with reset…

…-to-lab for that version.
cloudera-labs · Jul 22, 2022 · 8ced5f9 · 8ced5f9
1 parent e1c25ad
commit 8ced5f9
Show file tree

Hide file tree

Showing 37 changed files with 119 additions and 78 deletions.
diff --git a/images/ssb/add-catalog-sr.png b/images/ssb/add-catalog-sr.png
diff --git a/images/ssb/add-filter.png b/images/ssb/add-filter.png
diff --git a/images/ssb/add-kafka-provider.png b/images/ssb/add-kafka-provider.png
diff --git a/images/ssb/add-sr-catalog.png b/images/ssb/add-sr-catalog.png
diff --git a/images/ssb/add-table.png b/images/ssb/add-table.png
diff --git a/images/ssb/code-completion.png b/images/ssb/code-completion.png
diff --git a/images/ssb/detect-schema.png b/images/ssb/detect-schema.png
diff --git a/images/ssb/edit-job.png b/images/ssb/edit-job.png
diff --git a/images/ssb/event-time-column.png b/images/ssb/event-time-column.png
diff --git a/images/ssb/first-query.png b/images/ssb/first-query.png
diff --git a/images/ssb/hide-tables.png b/images/ssb/hide-tables.png
diff --git a/images/ssb/job-details.png b/images/ssb/job-details.png
diff --git a/images/ssb/jobs-running.png b/images/ssb/jobs-running.png
diff --git a/images/ssb/kafka-source.png b/images/ssb/kafka-source.png
diff --git a/images/ssb/mv-config1.png b/images/ssb/mv-config1.png
diff --git a/images/ssb/mv-config2.png b/images/ssb/mv-config2.png
diff --git a/images/ssb/mv-config2b.png b/images/ssb/mv-config2b.png
diff --git a/images/ssb/mv-config3.png b/images/ssb/mv-config3.png
diff --git a/images/ssb/mv-contents.png b/images/ssb/mv-contents.png
diff --git a/images/ssb/mv-parameters.png b/images/ssb/mv-parameters.png
diff --git a/images/ssb/mv-url-parameters.png b/images/ssb/mv-url-parameters.png
diff --git a/images/ssb/new-job.png b/images/ssb/new-job.png
diff --git a/images/ssb/register-kafka-provider.png b/images/ssb/register-kafka-provider.png
diff --git a/images/ssb/removed-create-table.png b/images/ssb/removed-create-table.png
diff --git a/images/ssb/source-properties.png b/images/ssb/source-properties.png
diff --git a/images/ssb/source-transformations.png b/images/ssb/source-transformations.png
diff --git a/images/ssb/sql-aggr-results.png b/images/ssb/sql-aggr-results.png
diff --git a/images/ssb/sql-aggregation.png b/images/ssb/sql-aggregation.png
diff --git a/images/ssb/sql-execution.png b/images/ssb/sql-execution.png
diff --git a/images/ssb/sr-tables.png b/images/ssb/sr-tables.png
diff --git a/images/ssb/stats-results.png b/images/ssb/stats-results.png
diff --git a/images/ssb/stop-job.png b/images/ssb/stop-job.png
diff --git a/images/ssb/template-kafka-json.png b/images/ssb/template-kafka-json.png
diff --git a/images/ssb/template-table-ddl.png b/images/ssb/template-table-ddl.png
diff --git a/images/ssb/template-table-edited.png b/images/ssb/template-table-edited.png
diff --git a/setup/terraform/resources/labs/utils/ssb.py b/setup/terraform/resources/labs/utils/ssb.py
@@ -37,11 +37,17 @@ def _get_csrf_token(txt, quiet=True):
 
 
 def _get_ui_port():
-    return '8001' if is_tls_enabled() else '8000'
+    if is_csa17_or_later():
+        return '8470' if is_tls_enabled() else '8070'
+    else:
+        return '8001' if is_tls_enabled() else '8000'
 
 
 def _get_api_url():
-    return '{}://{}:{}/api/v1'.format(get_url_scheme(), get_hostname(), _get_ui_port())
+    if is_csa17_or_later():
+        return '{}://{}:{}'.format(get_url_scheme(), get_hostname(), _get_ui_port())
+    else:
+        return '{}://{}:{}/api/v1'.format(get_url_scheme(), get_hostname(), _get_ui_port())
 
 
 def _get_rest_api_url():
@@ -61,16 +67,16 @@ def _get_url(api_type):
         return _get_rest_api_url()
 
 
-def _api_call(func, path, data=None, files=None, headers=None, api_type=_API_INTERNAL, token=False):
+def _api_call(func, path, data=None, files=None, headers=None, api_type=_API_INTERNAL, token=False, auth=None):
     global _SSB_CSRF_TOKEN
     if not headers:
         headers = {}
     if api_type != _API_UI:
         headers['Content-Type'] = 'application/json'
         data = json.dumps(data)
-    auth = None
     if is_kerberos_enabled():
-        auth = HTTPKerberosAuth(mutual_authentication=DISABLED)
+        if not auth:
+            auth = HTTPKerberosAuth(mutual_authentication=DISABLED)
     else:
         headers['Username'] = 'admin'
     if token:
@@ -87,8 +93,8 @@ def _api_call(func, path, data=None, files=None, headers=None, api_type=_API_INT
     return resp
 
 
-def _api_get(path, data=None, api_type=_API_INTERNAL, token=False):
-    return _api_call(_get_session().get, path, data=data, api_type=api_type, token=token)
+def _api_get(path, data=None, headers=None, api_type=_API_INTERNAL, token=False, auth=None):
+    return _api_call(_get_session().get, path, data=data, headers=headers, api_type=api_type, token=token, auth=auth)
 
 
 def _api_post(path, data=None, files=None, headers=None, api_type=_API_INTERNAL, token=False):
@@ -107,7 +113,10 @@ def _get_session():
             _SSB_SESSION.verify = get_truststore_path()
 
         _api_get('/login', api_type=_API_UI)
-        _api_post('/login', {'next': '', 'login': _SSB_USER, 'password': get_the_pwd()}, api_type=_API_UI, token=True)
+        if is_csa17_or_later():
+            _api_get('/internal/user/current', auth=(_SSB_USER, get_the_pwd()))
+        else:
+            _api_post('/login', {'next': '', 'login': _SSB_USER, 'password': get_the_pwd()}, api_type=_API_UI, token=True)
     return _SSB_SESSION
 
 
@@ -128,6 +137,10 @@ def is_csa16_or_later():
     return _get_csa_version() >= [1, 6]
 
 
+def is_csa17_or_later():
+    return _get_csa_version() >= [1, 7]
+
+
 def is_ssb_installed():
     return len(cm.get_services('SQL_STREAM_BUILDER')) > 0
 

diff --git a/workshop_ssb.adoc b/workshop_ssb.adoc