feat(bigquery): Support Fine Grained ACLs for Datasets by whuffman36 · Pull Request #3803 · googleapis/java-bigquery · GitHub | Latest TMZ Celebrity News & Gossip | Watch TMZ Live
Skip to content

feat(bigquery): Support Fine Grained ACLs for Datasets #3803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 30, 2025
Merged

feat(bigquery): Support Fine Grained ACLs for Datasets #3803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd60bb7
feat(bigquery): Support Fine Grained ACLs for Datasets
whuffman36 May 28, 2025
5dccb9a
fix style
whuffman36 May 28, 2025
5d5077c
Change enum strings to uppercase
whuffman36 May 28, 2025
fddc20f
add unspecified enum option
whuffman36 May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,42 @@ public String getSelector() {
}
}

enum DatasetView {
DATASET_VIEW_UNSPECIFIED("DATASET_VIEW_UNSPECIFIED"),
FULL("FULL"),
METADATA("METADATA"),
ACL("ACL");

private final String view;

DatasetView(String view) {
this.view = view;
}

@Override
public String toString() {
return view;
}
}

enum DatasetUpdateMode {
UPDATE_MODE_UNSPECIFIED("UPDATE_MODE_UNSPECIFIED"),
UPDATE_FULL("UPDATE_FULL"),
UPDATE_METADATA("UPDATE_METADATA"),
UPDATE_ACL("UPDATE_ACL");

private final String updateMode;

DatasetUpdateMode(String updateMode) {
this.updateMode = updateMode;
}

@Override
public String toString() {
return updateMode;
}
}

/**
* Fields of a BigQuery Table resource.
*
Expand Down Expand Up @@ -307,6 +343,22 @@ public static DatasetOption fields(DatasetField... fields) {
public static DatasetOption accessPolicyVersion(Integer accessPolicyVersion) {
return new DatasetOption(BigQueryRpc.Option.ACCESS_POLICY_VERSION, accessPolicyVersion);
}

/**
* Returns an option to specify the view that determines which dataset information is returned.
* By default, metadata and ACL information are returned.
*/
public static DatasetOption datasetView(DatasetView datasetView) {
return new DatasetOption(BigQueryRpc.Option.DATASET_VIEW, datasetView);
}

/**
* Returns an option to specify the fields of dataset that update/patch operation is targeting.
* By default, both metadata and ACL fields are updated.
*/
public static DatasetOption updateMode(DatasetUpdateMode updateMode) {
return new DatasetOption(BigQueryRpc.Option.DATASET_UPDATE_MODE, updateMode);
}
}

/** Class for specifying dataset delete options. */
Expand Down
4 changes: 3 additions & 1 deletion google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/BigQueryRpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ enum Option {
TABLE_METADATA_VIEW("view"),
RETRY_OPTIONS("retryOptions"),
BIGQUERY_RETRY_CONFIG("bigQueryRetryConfig"),
ACCESS_POLICY_VERSION("accessPolicyVersion");
ACCESS_POLICY_VERSION("accessPolicyVersion"),
DATASET_VIEW("datasetView"),
DATASET_UPDATE_MODE("datasetUpdateMode");

private final String value;

Expand Down
18 changes: 10 additions & 8 deletions google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,11 @@ public Dataset getDatasetSkipExceptionTranslation(
.get(projectId, datasetId)
.setFields(Option.FIELDS.getString(options))
.setPrettyPrint(false);
for (Map.Entry<Option, ?> entry : options.entrySet()) {
if (entry.getKey() == Option.ACCESS_POLICY_VERSION && entry.getValue() != null) {
bqGetRequest.setAccessPolicyVersion((Integer) entry.getValue());
}
if (options.containsKey(Option.ACCESS_POLICY_VERSION)) {
bqGetRequest.setAccessPolicyVersion((Integer) options.get(Option.ACCESS_POLICY_VERSION));
}
if (options.containsKey(Option.DATASET_VIEW)) {
bqGetRequest.setDatasetView(options.get(Option.DATASET_VIEW).toString());
}
return bqGetRequest.execute();
}
Expand Down Expand Up @@ -350,10 +351,11 @@ public Dataset patchSkipExceptionTranslation(Dataset dataset, Map<Option, ?> opt
.patch(reference.getProjectId(), reference.getDatasetId(), dataset)
.setPrettyPrint(false)
.setFields(Option.FIELDS.getString(options));
for (Map.Entry<Option, ?> entry : options.entrySet()) {
if (entry.getKey() == Option.ACCESS_POLICY_VERSION && entry.getValue() != null) {
bqPatchRequest.setAccessPolicyVersion((Integer) entry.getValue());
}
if (options.containsKey(Option.ACCESS_POLICY_VERSION)) {
bqPatchRequest.setAccessPolicyVersion((Integer) options.get(Option.ACCESS_POLICY_VERSION));
}
if (options.containsKey(Option.DATASET_UPDATE_MODE)) {
bqPatchRequest.setUpdateMode(options.get(Option.DATASET_UPDATE_MODE).toString());
}
return bqPatchRequest.execute();
}
Expand Down
14 changes: 10 additions & 4 deletions google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
import com.google.cloud.bigquery.BigQuery.DatasetField;
import com.google.cloud.bigquery.BigQuery.DatasetListOption;
import com.google.cloud.bigquery.BigQuery.DatasetOption;
import com.google.cloud.bigquery.BigQuery.DatasetUpdateMode;
import com.google.cloud.bigquery.BigQuery.DatasetView;
import com.google.cloud.bigquery.BigQuery.JobField;
import com.google.cloud.bigquery.BigQuery.JobListOption;
import com.google.cloud.bigquery.BigQuery.JobOption;
Expand Down Expand Up @@ -1235,18 +1237,20 @@ public void testGetDatasetWithAccessPolicyVersion() throws IOException {
"requests after the year 2024",
"location");
Acl acl = Acl.of(user, role, condition);
DatasetOption datasetOption = DatasetOption.accessPolicyVersion(3);
DatasetOption accessPolicyOption = DatasetOption.accessPolicyVersion(3);
DatasetOption viewOption = DatasetOption.datasetView(DatasetView.FULL);

Dataset dataset =
bigquery.create(
DatasetInfo.newBuilder(accessPolicyDataset)
.setDescription("Some Description")
.setAcl(ImmutableList.of(acl))
.build(),
datasetOption);
accessPolicyOption);
assertThat(dataset).isNotNull();

Dataset remoteDataset = bigquery.getDataset(accessPolicyDataset, datasetOption);
Dataset remoteDataset =
bigquery.getDataset(accessPolicyDataset, accessPolicyOption, viewOption);
assertNotNull(remoteDataset);
assertEquals(dataset.getDescription(), remoteDataset.getDescription());
assertNotNull(remoteDataset.getCreationTime());
Expand Down Expand Up @@ -1355,14 +1359,16 @@ public void testUpdateDatabaseWithAccessPolicyVersion() throws IOException {
acls.add(acl);

DatasetOption datasetOption = DatasetOption.accessPolicyVersion(3);
DatasetOption updateModeOption = DatasetOption.updateMode(DatasetUpdateMode.UPDATE_FULL);
Dataset updatedDataset =
bigquery.update(
dataset.toBuilder()
.setDescription("Updated Description")
.setLabels(null)
.setAcl(acls)
.build(),
datasetOption);
datasetOption,
updateModeOption);
assertNotNull(updatedDataset);
assertEquals(updatedDataset.getDescription(), "Updated Description");
assertThat(updatedDataset.getLabels().isEmpty());
Expand Down

TMZ Celebrity News – Breaking Stories, Videos & Gossip

Looking for the latest TMZ celebrity news? You've come to the right place. From shocking Hollywood scandals to exclusive videos, TMZ delivers it all in real time.

Whether it’s a red carpet slip-up, a viral paparazzi moment, or a legal drama involving your favorite stars, TMZ news is always first to break the story. Stay in the loop with daily updates, insider tips, and jaw-dropping photos.

🎥 Watch TMZ Live

TMZ Live brings you daily celebrity news and interviews straight from the TMZ newsroom. Don’t miss a beat—watch now and see what’s trending in Hollywood.