Skip to content
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

Jump to bottom

breakfix: convert public access block config fields to nilable like s3 #2385

Merged
merged 3 commits into from
Nov 21, 2023
Merged

breakfix: convert public access block config fields to nilable like s3 #2385

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ecd43b
breakfix: convert public access block config fields to nilable like s3
lucix-aws Nov 21, 2023
06d1bf4
uncomplicate toBuilder invocation
lucix-aws Nov 21, 2023
92d13b6
Merge branch 'main' into breakfix-s3controlpublicaccessblock
lucix-aws Nov 21, 2023
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
8 changes: 8 additions & 0 deletions .changelog/08c84fb2c6644d8b983c9986c770cfda.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"id": "08c84fb2-c664-4d8b-983c-9986c770cfda",
"type": "feature",
"description": "**BREAK FIX**: Convert S3Control PublicAccessBlock field types to nilable. See #2384, #2162.",
"modules": [
"service/s3control"
]
}
52 changes: 52 additions & 0 deletions ...gen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/RemoveDefaults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package software.amazon.smithy.aws.go.codegen.customization;

import software.amazon.smithy.go.codegen.GoSettings;
import software.amazon.smithy.go.codegen.integration.GoIntegration;
import software.amazon.smithy.model.Model;
import software.amazon.smithy.model.shapes.Shape;
import software.amazon.smithy.model.shapes.AbstractShapeBuilder;
import software.amazon.smithy.model.shapes.ShapeId;
import software.amazon.smithy.model.traits.DefaultTrait;
import software.amazon.smithy.model.transform.ModelTransformer;
import software.amazon.smithy.utils.MapUtils;
import software.amazon.smithy.utils.SetUtils;
import software.amazon.smithy.utils.ToSmithyBuilder;

import java.util.Map;
import java.util.Set;

public class RemoveDefaults implements GoIntegration {
private static final Map<ShapeId, Set<ShapeId>> toRemove = MapUtils.of(
ShapeId.from("com.amazonaws.s3control#AWSS3ControlServiceV20180820"), SetUtils.of(
ShapeId.from("com.amazonaws.s3control#PublicAccessBlockConfiguration$BlockPublicAcls"),
ShapeId.from("com.amazonaws.s3control#PublicAccessBlockConfiguration$IgnorePublicAcls"),
ShapeId.from("com.amazonaws.s3control#PublicAccessBlockConfiguration$BlockPublicPolicy"),
ShapeId.from("com.amazonaws.s3control#PublicAccessBlockConfiguration$RestrictPublicBuckets")
)
);

private boolean mustPreprocess(ShapeId service) {
return toRemove.containsKey(service);
}

@Override
public Model preprocessModel(Model model, GoSettings settings) {
var serviceId = settings.getService();
return mustPreprocess(serviceId)
? removeDefaults(model, toRemove.get(serviceId))
: model;
}

private Model removeDefaults(Model model, Set<ShapeId> fromShapes) {
return ModelTransformer.create().mapShapes(model, it ->
fromShapes.contains(it.getId())
? withoutDefault(it)
: it
);
}

private Shape withoutDefault(Shape shape) {
var builder = ((ToSmithyBuilder<?>) shape).toBuilder();
return ((AbstractShapeBuilder<?, ?>) builder).removeTrait(DefaultTrait.ID).build();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
var builder = ((ToSmithyBuilder<?>) shape).toBuilder();
return ((AbstractShapeBuilder<?, ?>) builder).removeTrait(DefaultTrait.ID).build();
return Shape.shapeToBuilder(shape).removeTrait(DefaultTrait.ID).build();

Weird casting stuff was only needed in kotlin

}
}
1 change: 1 addition & 0 deletions ...n/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,4 @@ software.amazon.smithy.aws.go.codegen.customization.auth.EndpointAuthResolution
software.amazon.smithy.aws.go.codegen.customization.auth.AwsSigV4aAuthScheme
software.amazon.smithy.aws.go.codegen.customization.auth.LegacyAuthContextOverride
software.amazon.smithy.aws.go.codegen.customization.auth.IgnoreAnonymousCredentials
software.amazon.smithy.aws.go.codegen.customization.RemoveDefaults
8 changes: 4 additions & 4 deletions service/s3control/deserializers.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions service/s3control/serializers.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions service/s3control/types/types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading