From 773d7648f298f8e6606d64ff505f77e35dccf0ce Mon Sep 17 00:00:00 2001 From: chrislu Date: Tue, 26 Aug 2025 08:21:33 -0700 Subject: [PATCH] fix compilation --- weed/s3api/s3_end_to_end_test.go | 16 +++++++------- weed/s3api/s3_jwt_auth_test.go | 28 ++++++++++++------------- weed/s3api/s3_multipart_iam_test.go | 6 +++--- weed/s3api/s3_presigned_url_iam_test.go | 10 ++++----- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/weed/s3api/s3_end_to_end_test.go b/weed/s3api/s3_end_to_end_test.go index 57df893c0..d4607333f 100644 --- a/weed/s3api/s3_end_to_end_test.go +++ b/weed/s3api/s3_end_to_end_test.go @@ -440,10 +440,10 @@ func setupS3ReadOnlyRole(ctx context.Context, manager *integration.IAMManager) { }, } - manager.CreatePolicy(ctx, "S3ReadOnlyPolicy", readOnlyPolicy) + manager.CreatePolicy(ctx, "", "S3ReadOnlyPolicy", readOnlyPolicy) // Create role - manager.CreateRole(ctx, "S3ReadOnlyRole", &integration.RoleDefinition{ + manager.CreateRole(ctx, "", "S3ReadOnlyRole", &integration.RoleDefinition{ RoleName: "S3ReadOnlyRole", TrustPolicy: &policy.PolicyDocument{ Version: "2012-10-17", @@ -484,10 +484,10 @@ func setupS3AdminRole(ctx context.Context, manager *integration.IAMManager) { }, } - manager.CreatePolicy(ctx, "S3AdminPolicy", adminPolicy) + manager.CreatePolicy(ctx, "", "S3AdminPolicy", adminPolicy) // Create role - manager.CreateRole(ctx, "S3AdminRole", &integration.RoleDefinition{ + manager.CreateRole(ctx, "", "S3AdminRole", &integration.RoleDefinition{ RoleName: "S3AdminRole", TrustPolicy: &policy.PolicyDocument{ Version: "2012-10-17", @@ -528,10 +528,10 @@ func setupS3WriteRole(ctx context.Context, manager *integration.IAMManager) { }, } - manager.CreatePolicy(ctx, "S3WritePolicy", writePolicy) + manager.CreatePolicy(ctx, "", "S3WritePolicy", writePolicy) // Create role - manager.CreateRole(ctx, "S3WriteRole", &integration.RoleDefinition{ + manager.CreateRole(ctx, "", "S3WriteRole", &integration.RoleDefinition{ RoleName: "S3WriteRole", TrustPolicy: &policy.PolicyDocument{ Version: "2012-10-17", @@ -577,10 +577,10 @@ func setupS3IPRestrictedRole(ctx context.Context, manager *integration.IAMManage }, } - manager.CreatePolicy(ctx, "S3IPRestrictedPolicy", restrictedPolicy) + manager.CreatePolicy(ctx, "", "S3IPRestrictedPolicy", restrictedPolicy) // Create role - manager.CreateRole(ctx, "S3IPRestrictedRole", &integration.RoleDefinition{ + manager.CreateRole(ctx, "", "S3IPRestrictedRole", &integration.RoleDefinition{ RoleName: "S3IPRestrictedRole", TrustPolicy: &policy.PolicyDocument{ Version: "2012-10-17", diff --git a/weed/s3api/s3_jwt_auth_test.go b/weed/s3api/s3_jwt_auth_test.go index 0e9606241..50518e7b9 100644 --- a/weed/s3api/s3_jwt_auth_test.go +++ b/weed/s3api/s3_jwt_auth_test.go @@ -346,18 +346,18 @@ func setupTestReadOnlyRole(ctx context.Context, manager *integration.IAMManager) }, }, { - Sid: "AllowSTSSessionValidation", - Effect: "Allow", - Action: []string{"sts:ValidateSession"}, + Sid: "AllowSTSSessionValidation", + Effect: "Allow", + Action: []string{"sts:ValidateSession"}, Resource: []string{"*"}, }, }, } - manager.CreatePolicy(ctx, "S3ReadOnlyPolicy", readPolicy) + manager.CreatePolicy(ctx, "", "S3ReadOnlyPolicy", readPolicy) // Create role - manager.CreateRole(ctx, "S3ReadOnlyRole", &integration.RoleDefinition{ + manager.CreateRole(ctx, "", "S3ReadOnlyRole", &integration.RoleDefinition{ RoleName: "S3ReadOnlyRole", TrustPolicy: &policy.PolicyDocument{ Version: "2012-10-17", @@ -375,7 +375,7 @@ func setupTestReadOnlyRole(ctx context.Context, manager *integration.IAMManager) }) // Also create a TestReadRole for read-only authorization testing - manager.CreateRole(ctx, "TestReadRole", &integration.RoleDefinition{ + manager.CreateRole(ctx, "", "TestReadRole", &integration.RoleDefinition{ RoleName: "TestReadRole", TrustPolicy: &policy.PolicyDocument{ Version: "2012-10-17", @@ -408,18 +408,18 @@ func setupTestAdminRole(ctx context.Context, manager *integration.IAMManager) { }, }, { - Sid: "AllowSTSSessionValidation", - Effect: "Allow", - Action: []string{"sts:ValidateSession"}, + Sid: "AllowSTSSessionValidation", + Effect: "Allow", + Action: []string{"sts:ValidateSession"}, Resource: []string{"*"}, }, }, } - manager.CreatePolicy(ctx, "S3AdminPolicy", adminPolicy) + manager.CreatePolicy(ctx, "", "S3AdminPolicy", adminPolicy) // Create role - manager.CreateRole(ctx, "S3AdminRole", &integration.RoleDefinition{ + manager.CreateRole(ctx, "", "S3AdminRole", &integration.RoleDefinition{ RoleName: "S3AdminRole", TrustPolicy: &policy.PolicyDocument{ Version: "2012-10-17", @@ -437,7 +437,7 @@ func setupTestAdminRole(ctx context.Context, manager *integration.IAMManager) { }) // Also create a TestAdminRole with admin policy for authorization testing - manager.CreateRole(ctx, "TestAdminRole", &integration.RoleDefinition{ + manager.CreateRole(ctx, "", "TestAdminRole", &integration.RoleDefinition{ RoleName: "TestAdminRole", TrustPolicy: &policy.PolicyDocument{ Version: "2012-10-17", @@ -477,10 +477,10 @@ func setupTestIPRestrictedRole(ctx context.Context, manager *integration.IAMMana }, } - manager.CreatePolicy(ctx, "S3IPRestrictedPolicy", restrictedPolicy) + manager.CreatePolicy(ctx, "", "S3IPRestrictedPolicy", restrictedPolicy) // Create role - manager.CreateRole(ctx, "S3IPRestrictedRole", &integration.RoleDefinition{ + manager.CreateRole(ctx, "", "S3IPRestrictedRole", &integration.RoleDefinition{ RoleName: "S3IPRestrictedRole", TrustPolicy: &policy.PolicyDocument{ Version: "2012-10-17", diff --git a/weed/s3api/s3_multipart_iam_test.go b/weed/s3api/s3_multipart_iam_test.go index b162deafe..830edd579 100644 --- a/weed/s3api/s3_multipart_iam_test.go +++ b/weed/s3api/s3_multipart_iam_test.go @@ -538,10 +538,10 @@ func setupTestRolesForMultipart(ctx context.Context, manager *integration.IAMMan }, } - manager.CreatePolicy(ctx, "S3WritePolicy", writePolicy) + manager.CreatePolicy(ctx, "", "S3WritePolicy", writePolicy) // Create write role - manager.CreateRole(ctx, "S3WriteRole", &integration.RoleDefinition{ + manager.CreateRole(ctx, "", "S3WriteRole", &integration.RoleDefinition{ RoleName: "S3WriteRole", TrustPolicy: &policy.PolicyDocument{ Version: "2012-10-17", @@ -559,7 +559,7 @@ func setupTestRolesForMultipart(ctx context.Context, manager *integration.IAMMan }) // Create a role for multipart users - manager.CreateRole(ctx, "MultipartUser", &integration.RoleDefinition{ + manager.CreateRole(ctx, "", "MultipartUser", &integration.RoleDefinition{ RoleName: "MultipartUser", TrustPolicy: &policy.PolicyDocument{ Version: "2012-10-17", diff --git a/weed/s3api/s3_presigned_url_iam_test.go b/weed/s3api/s3_presigned_url_iam_test.go index 7828dd75f..5820740de 100644 --- a/weed/s3api/s3_presigned_url_iam_test.go +++ b/weed/s3api/s3_presigned_url_iam_test.go @@ -488,10 +488,10 @@ func setupTestRolesForPresigned(ctx context.Context, manager *integration.IAMMan }, } - manager.CreatePolicy(ctx, "S3ReadOnlyPolicy", readOnlyPolicy) + manager.CreatePolicy(ctx, "", "S3ReadOnlyPolicy", readOnlyPolicy) // Create read-only role - manager.CreateRole(ctx, "S3ReadOnlyRole", &integration.RoleDefinition{ + manager.CreateRole(ctx, "", "S3ReadOnlyRole", &integration.RoleDefinition{ RoleName: "S3ReadOnlyRole", TrustPolicy: &policy.PolicyDocument{ Version: "2012-10-17", @@ -524,10 +524,10 @@ func setupTestRolesForPresigned(ctx context.Context, manager *integration.IAMMan }, } - manager.CreatePolicy(ctx, "S3AdminPolicy", adminPolicy) + manager.CreatePolicy(ctx, "", "S3AdminPolicy", adminPolicy) // Create admin role - manager.CreateRole(ctx, "S3AdminRole", &integration.RoleDefinition{ + manager.CreateRole(ctx, "", "S3AdminRole", &integration.RoleDefinition{ RoleName: "S3AdminRole", TrustPolicy: &policy.PolicyDocument{ Version: "2012-10-17", @@ -545,7 +545,7 @@ func setupTestRolesForPresigned(ctx context.Context, manager *integration.IAMMan }) // Create a role for presigned URL users with admin permissions for testing - manager.CreateRole(ctx, "PresignedUser", &integration.RoleDefinition{ + manager.CreateRole(ctx, "", "PresignedUser", &integration.RoleDefinition{ RoleName: "PresignedUser", TrustPolicy: &policy.PolicyDocument{ Version: "2012-10-17",