fix compilation

This commit is contained in:
chrislu committed 2025-08-26 08:21:33 -07:00
1 parent c34b14de8c
commit 773d7648f2
4 files changed
+30 -30

No files matched your search

+8 -8
View File
@@ -440,10 +440,10 @@ func setupS3ReadOnlyRole(ctx context.Context, manager *integration.IAMManager) {
}, },
} }
manager.CreatePolicy(ctx, "S3ReadOnlyPolicy", readOnlyPolicy) manager.CreatePolicy(ctx, "", "S3ReadOnlyPolicy", readOnlyPolicy)
// Create role // Create role
manager.CreateRole(ctx, "S3ReadOnlyRole", &integration.RoleDefinition{ manager.CreateRole(ctx, "", "S3ReadOnlyRole", &integration.RoleDefinition{
RoleName: "S3ReadOnlyRole", RoleName: "S3ReadOnlyRole",
TrustPolicy: &policy.PolicyDocument{ TrustPolicy: &policy.PolicyDocument{
Version: "2012-10-17", 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 // Create role
manager.CreateRole(ctx, "S3AdminRole", &integration.RoleDefinition{ manager.CreateRole(ctx, "", "S3AdminRole", &integration.RoleDefinition{
RoleName: "S3AdminRole", RoleName: "S3AdminRole",
TrustPolicy: &policy.PolicyDocument{ TrustPolicy: &policy.PolicyDocument{
Version: "2012-10-17", 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 // Create role
manager.CreateRole(ctx, "S3WriteRole", &integration.RoleDefinition{ manager.CreateRole(ctx, "", "S3WriteRole", &integration.RoleDefinition{
RoleName: "S3WriteRole", RoleName: "S3WriteRole",
TrustPolicy: &policy.PolicyDocument{ TrustPolicy: &policy.PolicyDocument{
Version: "2012-10-17", 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 // Create role
manager.CreateRole(ctx, "S3IPRestrictedRole", &integration.RoleDefinition{ manager.CreateRole(ctx, "", "S3IPRestrictedRole", &integration.RoleDefinition{
RoleName: "S3IPRestrictedRole", RoleName: "S3IPRestrictedRole",
TrustPolicy: &policy.PolicyDocument{ TrustPolicy: &policy.PolicyDocument{
Version: "2012-10-17", Version: "2012-10-17",
+14 -14
View File
@@ -346,18 +346,18 @@ func setupTestReadOnlyRole(ctx context.Context, manager *integration.IAMManager)
}, },
}, },
{ {
Sid: "AllowSTSSessionValidation", Sid: "AllowSTSSessionValidation",
Effect: "Allow", Effect: "Allow",
Action: []string{"sts:ValidateSession"}, Action: []string{"sts:ValidateSession"},
Resource: []string{"*"}, Resource: []string{"*"},
}, },
}, },
} }
manager.CreatePolicy(ctx, "S3ReadOnlyPolicy", readPolicy) manager.CreatePolicy(ctx, "", "S3ReadOnlyPolicy", readPolicy)
// Create role // Create role
manager.CreateRole(ctx, "S3ReadOnlyRole", &integration.RoleDefinition{ manager.CreateRole(ctx, "", "S3ReadOnlyRole", &integration.RoleDefinition{
RoleName: "S3ReadOnlyRole", RoleName: "S3ReadOnlyRole",
TrustPolicy: &policy.PolicyDocument{ TrustPolicy: &policy.PolicyDocument{
Version: "2012-10-17", 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 // Also create a TestReadRole for read-only authorization testing
manager.CreateRole(ctx, "TestReadRole", &integration.RoleDefinition{ manager.CreateRole(ctx, "", "TestReadRole", &integration.RoleDefinition{
RoleName: "TestReadRole", RoleName: "TestReadRole",
TrustPolicy: &policy.PolicyDocument{ TrustPolicy: &policy.PolicyDocument{
Version: "2012-10-17", Version: "2012-10-17",
@@ -408,18 +408,18 @@ func setupTestAdminRole(ctx context.Context, manager *integration.IAMManager) {
}, },
}, },
{ {
Sid: "AllowSTSSessionValidation", Sid: "AllowSTSSessionValidation",
Effect: "Allow", Effect: "Allow",
Action: []string{"sts:ValidateSession"}, Action: []string{"sts:ValidateSession"},
Resource: []string{"*"}, Resource: []string{"*"},
}, },
}, },
} }
manager.CreatePolicy(ctx, "S3AdminPolicy", adminPolicy) manager.CreatePolicy(ctx, "", "S3AdminPolicy", adminPolicy)
// Create role // Create role
manager.CreateRole(ctx, "S3AdminRole", &integration.RoleDefinition{ manager.CreateRole(ctx, "", "S3AdminRole", &integration.RoleDefinition{
RoleName: "S3AdminRole", RoleName: "S3AdminRole",
TrustPolicy: &policy.PolicyDocument{ TrustPolicy: &policy.PolicyDocument{
Version: "2012-10-17", 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 // Also create a TestAdminRole with admin policy for authorization testing
manager.CreateRole(ctx, "TestAdminRole", &integration.RoleDefinition{ manager.CreateRole(ctx, "", "TestAdminRole", &integration.RoleDefinition{
RoleName: "TestAdminRole", RoleName: "TestAdminRole",
TrustPolicy: &policy.PolicyDocument{ TrustPolicy: &policy.PolicyDocument{
Version: "2012-10-17", 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 // Create role
manager.CreateRole(ctx, "S3IPRestrictedRole", &integration.RoleDefinition{ manager.CreateRole(ctx, "", "S3IPRestrictedRole", &integration.RoleDefinition{
RoleName: "S3IPRestrictedRole", RoleName: "S3IPRestrictedRole",
TrustPolicy: &policy.PolicyDocument{ TrustPolicy: &policy.PolicyDocument{
Version: "2012-10-17", Version: "2012-10-17",
+3 -3
View File
@@ -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 // Create write role
manager.CreateRole(ctx, "S3WriteRole", &integration.RoleDefinition{ manager.CreateRole(ctx, "", "S3WriteRole", &integration.RoleDefinition{
RoleName: "S3WriteRole", RoleName: "S3WriteRole",
TrustPolicy: &policy.PolicyDocument{ TrustPolicy: &policy.PolicyDocument{
Version: "2012-10-17", Version: "2012-10-17",
@@ -559,7 +559,7 @@ func setupTestRolesForMultipart(ctx context.Context, manager *integration.IAMMan
}) })
// Create a role for multipart users // Create a role for multipart users
manager.CreateRole(ctx, "MultipartUser", &integration.RoleDefinition{ manager.CreateRole(ctx, "", "MultipartUser", &integration.RoleDefinition{
RoleName: "MultipartUser", RoleName: "MultipartUser",
TrustPolicy: &policy.PolicyDocument{ TrustPolicy: &policy.PolicyDocument{
Version: "2012-10-17", Version: "2012-10-17",
+5 -5
View File
@@ -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 // Create read-only role
manager.CreateRole(ctx, "S3ReadOnlyRole", &integration.RoleDefinition{ manager.CreateRole(ctx, "", "S3ReadOnlyRole", &integration.RoleDefinition{
RoleName: "S3ReadOnlyRole", RoleName: "S3ReadOnlyRole",
TrustPolicy: &policy.PolicyDocument{ TrustPolicy: &policy.PolicyDocument{
Version: "2012-10-17", 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 // Create admin role
manager.CreateRole(ctx, "S3AdminRole", &integration.RoleDefinition{ manager.CreateRole(ctx, "", "S3AdminRole", &integration.RoleDefinition{
RoleName: "S3AdminRole", RoleName: "S3AdminRole",
TrustPolicy: &policy.PolicyDocument{ TrustPolicy: &policy.PolicyDocument{
Version: "2012-10-17", 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 // 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", RoleName: "PresignedUser",
TrustPolicy: &policy.PolicyDocument{ TrustPolicy: &policy.PolicyDocument{
Version: "2012-10-17", Version: "2012-10-17",