leaves12138 commented on code in PR #9: URL: https://github.com/apache/terraform-provider-paimon/pull/9#discussion_r3869260474
########## internal/provider/resource_permission.go: ########## @@ -0,0 +1,677 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package provider + +import ( + "context" + "errors" + "fmt" + "net/url" + "regexp" + "sort" + "time" + + "github.com/apache/terraform-provider-paimon/internal/client" + "github.com/hashicorp/terraform-plugin-framework-validators/setvalidator" + "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" + "github.com/hashicorp/terraform-plugin-framework/diag" + "github.com/hashicorp/terraform-plugin-framework/path" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/schema/validator" + "github.com/hashicorp/terraform-plugin-framework/types" +) + +var ( + _ resource.Resource = &permissionResource{} + _ resource.ResourceWithImportState = &permissionResource{} + _ resource.ResourceWithValidateConfig = &permissionResource{} +) + +var permissionResourceTypes = []string{ + client.ResourceTypeCatalog, + client.ResourceTypeCatalogAll, + client.ResourceTypeDatabase, + client.ResourceTypeDatabaseAll, + client.ResourceTypeTable, + client.ResourceTypeColumn, + client.ResourceTypeFunction, + client.ResourceTypeView, +} + +var permissionAccesses = []string{ + client.PermissionAccessAll, + client.PermissionAccessCreateDatabase, + client.PermissionAccessDescribe, + client.PermissionAccessAlter, + client.PermissionAccessDrop, + client.PermissionAccessCreateTable, + client.PermissionAccessCreateFunction, + client.PermissionAccessCreateView, + client.PermissionAccessList, + client.PermissionAccessSelect, + client.PermissionAccessUpdate, + client.PermissionAccessGrant, +} + +var permissionAccessesByResource = map[string]map[string]bool{ + client.ResourceTypeCatalog: accessSet(client.PermissionAccessAll, client.PermissionAccessAlter, client.PermissionAccessDrop, client.PermissionAccessGrant, client.PermissionAccessCreateDatabase), + client.ResourceTypeCatalogAll: accessSet(client.PermissionAccessAll, client.PermissionAccessDescribe, client.PermissionAccessAlter, client.PermissionAccessDrop, client.PermissionAccessGrant, client.PermissionAccessCreateTable, client.PermissionAccessCreateView, client.PermissionAccessCreateFunction, client.PermissionAccessList, client.PermissionAccessSelect, client.PermissionAccessUpdate), + client.ResourceTypeDatabase: accessSet(client.PermissionAccessAll, client.PermissionAccessDescribe, client.PermissionAccessAlter, client.PermissionAccessDrop, client.PermissionAccessGrant, client.PermissionAccessCreateTable, client.PermissionAccessCreateView, client.PermissionAccessCreateFunction, client.PermissionAccessList), + client.ResourceTypeDatabaseAll: accessSet(client.PermissionAccessAll, client.PermissionAccessSelect, client.PermissionAccessUpdate, client.PermissionAccessAlter, client.PermissionAccessDrop, client.PermissionAccessGrant), + client.ResourceTypeTable: accessSet(client.PermissionAccessAll, client.PermissionAccessSelect, client.PermissionAccessUpdate, client.PermissionAccessAlter, client.PermissionAccessDrop, client.PermissionAccessGrant), + client.ResourceTypeColumn: accessSet(client.PermissionAccessSelect), + client.ResourceTypeView: accessSet(client.PermissionAccessAll, client.PermissionAccessSelect, client.PermissionAccessAlter, client.PermissionAccessDrop, client.PermissionAccessGrant), + client.ResourceTypeFunction: accessSet(client.PermissionAccessAll, client.PermissionAccessSelect, client.PermissionAccessAlter, client.PermissionAccessDrop, client.PermissionAccessGrant), +} + +var expireTimePattern = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}[Tt]\d{2}:\d{2}:\d{2}(?:\.\d{1,9})?[Zz]$`) Review Comment: On rechecking the Java Paimon protocol definition, this is now too permissive. `docs/static/rest-management-open-api.yaml` defines `ExpireTime` with `^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(?:\\.\\d{1,3})?Z$`, and `management-api.md` explicitly says the wire value contains at most three fractional digits. `Instant.parse` accepting `.123000Z` or lower-case `t`/`z` is DTO implementation permissiveness, not the contracted wire form. The provider now accepts and forwards values that violate the Java OpenAPI contract. Please retain the canonical upper-case `T`/`Z`, maximum-three-digit format, or normalize equivalent user input to that canonical wire value before sending it. Sorry—my previous comment focused on `PermissionAssignment.validateExpireTime` and missed the stricter OpenAPI definition. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
