Skip to content

Katta Admin CLI #139

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
Draft
wants to merge 33 commits into
base: main
Choose a base branch
from
Draft

Katta Admin CLI #139

wants to merge 33 commits into from

Conversation

@chenkins
Copy link
Contributor

@chenkins chenkins commented Jul 1, 2025 •
edited
Loading

@chenkins chenkins force-pushed the feature/admin-cli branch from d85ee87 to 49f2fa1 Compare July 1, 2025 13:40
@chenkins chenkins force-pushed the feature/admin-cli branch 3 times, most recently from c624b78 to 8a67fb0 Compare July 12, 2025 11:41
chenkins
chenkins commented Jul 12, 2025
View reviewed changes
admin-cli/src/main/java/cloud/katta/cli/commands/storage/AwsStsSetup.java
* See also: <a href="https://github.com/shift7-ch/katta-docs/blob/main/SETUP_KATTA_SERVER.md#setup-aws">Katta Docs</a>.
*/
@CommandLine.Command(name = "awsSetup", description = "Setup/update OIDC provider and roles for STS in AWS.", mixinStandardHelpOptions = true)
public class AwsStsSetup implements Callable<Void> {
Copy link
Contributor Author

@chenkins chenkins Jul 12, 2025

Choose a reason for hiding this comment

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

@dkocher Add option to print out command line commands instead of applying them - or is this overkill?

chenkins
chenkins commented Jul 12, 2025
View reviewed changes
admin-cli/pom.xml
Copy link
Contributor Author

@chenkins chenkins Jul 12, 2025

Choose a reason for hiding this comment

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

Add native image buildhttps://github.com/cryptomator/hub-cli/blob/develop/.github/workflows/native-image.yml

chenkins
chenkins commented Jul 12, 2025
View reviewed changes
admin-cli/pom.xml
Copy link
Contributor Author

@chenkins chenkins Jul 12, 2025

Choose a reason for hiding this comment

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

Add README similar to https://github.com/cryptomator/hub-cli/blob/develop/README.md

@chenkins chenkins requested a review from dkocher July 12, 2025 11:48
chenkins
chenkins commented Jul 12, 2025
View reviewed changes
admin-cli/src/main/java/cloud/katta/cli/commands/hub/StorageProfileAwsStsSetup.java Outdated
Comment on lines 52 to 54
.region("eu-west-1")
.regions(Arrays.asList("eu-west-1",
"eu-west-2",
"eu-west-3"))
Copy link
Contributor Author

@chenkins chenkins Jul 12, 2025

Choose a reason for hiding this comment

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

extract cli options

chenkins
chenkins commented Jul 12, 2025
View reviewed changes
admin-cli/src/main/java/cloud/katta/cli/commands/storage/AwsStsSetup.java Outdated
if(existingOIDCProvider.isEmpty()) {
final CreateOpenIdConnectProviderResponse openIDConnectProvider = iam.createOpenIDConnectProvider(CreateOpenIdConnectProviderRequest.builder()
.url(realmUrl)
.clientIDList("cryptomator", "cryptomatorhub", "cryptomatorvaults")
Copy link
Contributor Author

@chenkins chenkins Jul 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Harden conditions in trust policies on client_id and possibly role?

@chenkins chenkins force-pushed the feature/admin-cli branch 6 times, most recently from 5e1ae68 to 31f9be9 Compare September 26, 2025 11:56
@dkocher dkocher added this to the 1.0.0 milestone Nov 4, 2025
chenkins
chenkins commented Nov 4, 2025
View reviewed changes
admin-cli/src/main/java/cloud/katta/cli/commands/storage/AwsStsSetup.java
// aws iam create-role --role-name cipherduck-createbucket --assume-role-policy-document file://src/main/resources/cipherduck/setup/aws_stscreatebuckettrustpolicy.json
// aws iam put-role-policy --role-name cipherduck-createbucket --policy-name cipherduck-createbucket --policy-document file://src/main/resources/cipherduck/setup/aws_stscreatebucketpermissionpolicy.json
final String awsSTSCreateBucketRoleName = String.format("%s-createbucket", arnPostfixSanitized);
final JSONObject awsSTSCreateBuckeTrustPolicyTemplate = new JSONObject(IOUtils.toString(KattaSetupCli.class.getResourceAsStream("/setup/aws_sts/createbuckettrustpolicy.json"), Charset.defaultCharset()));
Copy link
Contributor Author

@chenkins chenkins Nov 4, 2025

Choose a reason for hiding this comment

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

Remove dependency to test resources.

chenkins
chenkins commented Nov 4, 2025
View reviewed changes
admin-cli/pom.xml
Comment on lines +116 to +135
<configuration>
<artifactItems>
<artifactItem>
<groupId>cloud.katta</groupId>
<artifactId>katta-clientlib-hub</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/test-classes</outputDirectory>
<includes>**/*</includes>
</artifactItem>
</artifactItems>
</configuration>
Copy link
Contributor Author

@chenkins chenkins Nov 4, 2025

Choose a reason for hiding this comment

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

needs packaged/installed dependency in reactory - is there a better way?

chenkins
chenkins commented Nov 4, 2025
View reviewed changes
admin-cli/src/main/java/cloud/katta/cli/commands/hub/StorageProfileAwsStaticSetup.java
Comment on lines 39 to 43
.protocol(Protocol.S3_STATIC)
.storageClass(S3STORAGECLASSES.STANDARD)
.archived(false)
.scheme("https")
.port(443)
Copy link
Contributor Author

@chenkins chenkins Nov 4, 2025

Choose a reason for hiding this comment

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

extract cli options

chenkins
chenkins commented Nov 4, 2025
View reviewed changes
hub/pom.xml
Comment on lines +30 to +41
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.2</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
Copy link
Contributor Author

@chenkins chenkins Nov 4, 2025

Choose a reason for hiding this comment

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

De-normalize instead?

chenkins added 21 commits November 4, 2025 19:50
@chenkins
Extract AbstractStorageProfile.
aa8e289
@chenkins
Add storage profile AWS STS setup test.
de8817b
@chenkins
Add storage profile AWS static setup test.
e9e842a
@chenkins
Pull up testcontainer setup and teardown.
b6bb562
@chenkins
Add assertions.
19bad20
@chenkins
Cleanup package structure.
8d414bf
@chenkins
Pull up hub session setup.
515f4f3
@chenkins
Add IT for storageProfileAWSSTS command.
d960e3e
@chenkins
Cleanup docs.
e525e39
@chenkins
Cleanup docs.
a02b205
@chenkins
Add MinioStsSetup createbucket policy.
c76f76a
@chenkins
Cleanup package structure.
d2954bc
@chenkins
Add MinioStsSetup createbucket + accessbucket policy.
a9708cf
@chenkins
Print mc idp commands in lack of client API.
99a7532
@chenkins
Fix compile.
60a2681
@chenkins
Improve documentation.
b5e3d61
@chenkins
Cleanup.
4da7507
@chenkins
Fix resource path.
92c11da
@chenkins
Add --name option for storage profile clis.
d52e319
@chenkins
Add --clientId option for AWS STS setup.
bbd220e
@chenkins
Use AWS SDK for MinIO createbucket policy.
618042d
chenkins
chenkins commented Nov 4, 2025
View reviewed changes
admin-cli/src/test/java/cloud/katta/cli/commands/hub/StorageProfileArchiveIT.java
Copy link
Contributor Author

@chenkins chenkins Nov 4, 2025

Choose a reason for hiding this comment

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

ITs take very long! Can we speed up?

@chenkins chenkins mentioned this pull request Nov 6, 2025
Draft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dkocher dkocher Awaiting requested review from dkocher

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

1.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@chenkins @dkocher