This is an automated email from the ASF dual-hosted git repository.
emaynard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git
The following commit(s) were added to refs/heads/main by this push:
new e724efc7b done (#1297)
e724efc7b is described below
commit e724efc7b88c87a4323eb1bfc7fc54c5a7120911
Author: Eric Maynard <[email protected]>
AuthorDate: Thu Apr 3 21:48:32 2025 -0700
done (#1297)
---
regtests/t_spark_sql/src/spark_sql_azure_blob.sh | 5 -----
regtests/t_spark_sql/src/spark_sql_azure_dfs.sh | 5 -----
regtests/t_spark_sql/src/spark_sql_basic.sh | 5 -----
regtests/t_spark_sql/src/spark_sql_gcp.sh | 5 -----
regtests/t_spark_sql/src/spark_sql_s3.sh | 5 -----
regtests/t_spark_sql/src/spark_sql_s3_cross_region.sh | 5 -----
regtests/t_spark_sql/src/spark_sql_views.sh | 5 -----
7 files changed, 35 deletions(-)
diff --git a/regtests/t_spark_sql/src/spark_sql_azure_blob.sh
b/regtests/t_spark_sql/src/spark_sql_azure_blob.sh
index 72d715552..4b9dd65fa 100755
--- a/regtests/t_spark_sql/src/spark_sql_azure_blob.sh
+++ b/regtests/t_spark_sql/src/spark_sql_azure_blob.sh
@@ -30,11 +30,6 @@ curl -i -X PUT -H "Authorization: Bearer
${SPARK_BEARER_TOKEN}" -H 'Accept: appl
http://${POLARIS_HOST:-localhost}:8181/api/management/v1/catalogs/spark_sql_azure_blob_catalog/catalog-roles/catalog_admin/grants
\
-d '{"type": "catalog", "privilege": "TABLE_WRITE_DATA"}' > /dev/stderr
-# For now, also explicitly assign the catalog_admin to the service_admin.
Remove once GS fully rolled out for auto-assign.
-curl -i -X PUT -H "Authorization: Bearer ${SPARK_BEARER_TOKEN}" -H 'Accept:
application/json' -H 'Content-Type: application/json' \
-
http://${POLARIS_HOST:-localhost}:8181/api/management/v1/principal-roles/service_admin/catalog-roles/spark_sql_azure_blob_catalog
\
- -d '{"name": "catalog_admin"}' > /dev/stderr
-
curl -H "Authorization: Bearer ${SPARK_BEARER_TOKEN}" -H 'Accept:
application/json' -H 'Content-Type: application/json' \
"http://${POLARIS_HOST:-localhost}:8181/api/catalog/v1/config?warehouse=spark_sql_azure_blob_catalog";
echo
diff --git a/regtests/t_spark_sql/src/spark_sql_azure_dfs.sh
b/regtests/t_spark_sql/src/spark_sql_azure_dfs.sh
index 9c8117d01..bf9f322f9 100755
--- a/regtests/t_spark_sql/src/spark_sql_azure_dfs.sh
+++ b/regtests/t_spark_sql/src/spark_sql_azure_dfs.sh
@@ -30,11 +30,6 @@ curl -i -X PUT -H "Authorization: Bearer
${SPARK_BEARER_TOKEN}" -H 'Accept: appl
http://${POLARIS_HOST:-localhost}:8181/api/management/v1/catalogs/spark_sql_azure_dfs_catalog/catalog-roles/catalog_admin/grants
\
-d '{"type": "catalog", "privilege": "TABLE_WRITE_DATA"}' > /dev/stderr
-# For now, also explicitly assign the catalog_admin to the service_admin.
Remove once GS fully rolled out for auto-assign.
-curl -i -X PUT -H "Authorization: Bearer ${SPARK_BEARER_TOKEN}" -H 'Accept:
application/json' -H 'Content-Type: application/json' \
-
http://${POLARIS_HOST:-localhost}:8181/api/management/v1/principal-roles/service_admin/catalog-roles/spark_sql_azure_dfs_catalog
\
- -d '{"name": "catalog_admin"}' > /dev/stderr
-
curl -H "Authorization: Bearer ${SPARK_BEARER_TOKEN}" -H 'Accept:
application/json' -H 'Content-Type: application/json' \
"http://${POLARIS_HOST:-localhost}:8181/api/catalog/v1/config?warehouse=spark_sql_azure_dfs_catalog";
echo
diff --git a/regtests/t_spark_sql/src/spark_sql_basic.sh
b/regtests/t_spark_sql/src/spark_sql_basic.sh
index 2ec97cc26..c2d828d64 100755
--- a/regtests/t_spark_sql/src/spark_sql_basic.sh
+++ b/regtests/t_spark_sql/src/spark_sql_basic.sh
@@ -30,11 +30,6 @@ curl -i -X PUT -H "Authorization: Bearer
${SPARK_BEARER_TOKEN}" -H 'Accept: appl
http://${POLARIS_HOST:-localhost}:8181/api/management/v1/catalogs/spark_sql_basic_catalog/catalog-roles/catalog_admin/grants
\
-d '{"type": "catalog", "privilege": "TABLE_WRITE_DATA"}' > /dev/stderr
-# For now, also explicitly assign the catalog_admin to the service_admin.
Remove once GS fully rolled out for auto-assign.
-curl -i -X PUT -H "Authorization: Bearer ${SPARK_BEARER_TOKEN}" -H 'Accept:
application/json' -H 'Content-Type: application/json' \
-
http://${POLARIS_HOST:-localhost}:8181/api/management/v1/principal-roles/service_admin/catalog-roles/spark_sql_basic_catalog
\
- -d '{"name": "catalog_admin"}' > /dev/stderr
-
curl -H "Authorization: Bearer ${SPARK_BEARER_TOKEN}" -H 'Accept:
application/json' -H 'Content-Type: application/json' \
"http://${POLARIS_HOST:-localhost}:8181/api/catalog/v1/config?warehouse=spark_sql_basic_catalog";
echo
diff --git a/regtests/t_spark_sql/src/spark_sql_gcp.sh
b/regtests/t_spark_sql/src/spark_sql_gcp.sh
index 20f8fd1a9..62c86e206 100755
--- a/regtests/t_spark_sql/src/spark_sql_gcp.sh
+++ b/regtests/t_spark_sql/src/spark_sql_gcp.sh
@@ -30,11 +30,6 @@ curl -i -X PUT -H "Authorization: Bearer
${SPARK_BEARER_TOKEN}" -H 'Accept: appl
http://${POLARIS_HOST:-localhost}:8181/api/management/v1/catalogs/spark_sql_gcp_catalog/catalog-roles/catalog_admin/grants
\
-d '{"type": "catalog", "privilege": "TABLE_WRITE_DATA"}' > /dev/stderr
-# For now, also explicitly assign the catalog_admin to the service_admin.
Remove once GS fully rolled out for auto-assign.
-curl -i -X PUT -H "Authorization: Bearer ${SPARK_BEARER_TOKEN}" -H 'Accept:
application/json' -H 'Content-Type: application/json' \
-
http://${POLARIS_HOST:-localhost}:8181/api/management/v1/principal-roles/service_admin/catalog-roles/spark_sql_gcp_catalog
\
- -d '{"name": "catalog_admin"}' > /dev/stderr
-
curl -H "Authorization: Bearer ${SPARK_BEARER_TOKEN}" -H 'Accept:
application/json' -H 'Content-Type: application/json' \
"http://${POLARIS_HOST:-localhost}:8181/api/catalog/v1/config?warehouse=spark_sql_gcp_catalog";
echo
diff --git a/regtests/t_spark_sql/src/spark_sql_s3.sh
b/regtests/t_spark_sql/src/spark_sql_s3.sh
index 6748bc901..949bd9631 100755
--- a/regtests/t_spark_sql/src/spark_sql_s3.sh
+++ b/regtests/t_spark_sql/src/spark_sql_s3.sh
@@ -35,11 +35,6 @@ curl -i -X PUT -H "Authorization: Bearer
${SPARK_BEARER_TOKEN}" -H 'Accept: appl
http://${POLARIS_HOST:-localhost}:8181/api/management/v1/catalogs/spark_sql_s3_catalog/catalog-roles/catalog_admin/grants
\
-d '{"type": "catalog", "privilege": "TABLE_WRITE_DATA"}' > /dev/stderr
-# For now, also explicitly assign the catalog_admin to the service_admin.
Remove once GS fully rolled out for auto-assign.
-curl -i -X PUT -H "Authorization: Bearer ${SPARK_BEARER_TOKEN}" -H 'Accept:
application/json' -H 'Content-Type: application/json' \
-
http://${POLARIS_HOST:-localhost}:8181/api/management/v1/principal-roles/service_admin/catalog-roles/spark_sql_s3_catalog
\
- -d '{"name": "catalog_admin"}' > /dev/stderr
-
curl -H "Authorization: Bearer ${SPARK_BEARER_TOKEN}" -H 'Accept:
application/json' -H 'Content-Type: application/json' \
"http://${POLARIS_HOST:-localhost}:8181/api/catalog/v1/config?warehouse=spark_sql_s3_catalog";
echo
diff --git a/regtests/t_spark_sql/src/spark_sql_s3_cross_region.sh
b/regtests/t_spark_sql/src/spark_sql_s3_cross_region.sh
index 76157ce4c..69eb7a1ae 100755
--- a/regtests/t_spark_sql/src/spark_sql_s3_cross_region.sh
+++ b/regtests/t_spark_sql/src/spark_sql_s3_cross_region.sh
@@ -37,11 +37,6 @@ curl -i -X PUT -H "Authorization: Bearer
${SPARK_BEARER_TOKEN}" -H 'Accept: appl
http://${POLARIS_HOST:-localhost}:8181/api/management/v1/catalogs/spark_sql_s3_cross_region_catalog/catalog-roles/catalog_admin/grants
\
-d '{"type": "catalog", "privilege": "TABLE_WRITE_DATA"}' > /dev/stderr
-# For now, also explicitly assign the catalog_admin to the service_admin.
Remove once GS fully rolled out for auto-assign.
-curl -i -X PUT -H "Authorization: Bearer ${SPARK_BEARER_TOKEN}" -H 'Accept:
application/json' -H 'Content-Type: application/json' \
-
http://${POLARIS_HOST:-localhost}:8181/api/management/v1/principal-roles/service_admin/catalog-roles/spark_sql_s3_cross_region_catalog
\
- -d '{"name": "catalog_admin"}' > /dev/stderr
-
echo "Catalog created"
cat << EOF | ${SPARK_HOME}/bin/spark-sql -S --conf
spark.sql.catalog.polaris.token="${SPARK_BEARER_TOKEN}" --conf
spark.sql.catalog.polaris.warehouse=spark_sql_s3_cross_region_catalog
use polaris;
diff --git a/regtests/t_spark_sql/src/spark_sql_views.sh
b/regtests/t_spark_sql/src/spark_sql_views.sh
index a47557a23..9c2d17128 100755
--- a/regtests/t_spark_sql/src/spark_sql_views.sh
+++ b/regtests/t_spark_sql/src/spark_sql_views.sh
@@ -30,11 +30,6 @@ curl -i -X PUT -H "Authorization: Bearer
${SPARK_BEARER_TOKEN}" -H 'Accept: appl
http://${POLARIS_HOST:-localhost}:8181/api/management/v1/catalogs/spark_sql_views_catalog/catalog-roles/catalog_admin/grants
\
-d '{"type": "catalog", "privilege": "TABLE_WRITE_DATA"}' > /dev/stderr
-# For now, also explicitly assign the catalog_admin to the service_admin.
Remove once GS fully rolled out for auto-assign.
-curl -i -X PUT -H "Authorization: Bearer ${SPARK_BEARER_TOKEN}" -H 'Accept:
application/json' -H 'Content-Type: application/json' \
-
http://${POLARIS_HOST:-localhost}:8181/api/management/v1/principal-roles/service_admin/catalog-roles/spark_sql_views_catalog
\
- -d '{"name": "catalog_admin"}' > /dev/stderr
-
curl -H "Authorization: Bearer ${SPARK_BEARER_TOKEN}" -H 'Accept:
application/json' -H 'Content-Type: application/json' \
"http://${POLARIS_HOST:-localhost}:8181/api/catalog/v1/config?warehouse=spark_sql_views_catalog";
echo
