Skip to content

Commit df37287

Browse files
committed
Allow referencing aspect models from multiple repositories. Add for cli
1 parent a760c77 commit df37287

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

tools/samm-cli/src/main/java/org/eclipse/esmf/AbstractInputHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ protected List<ResolutionStrategy> configuredStrategies() {
9090
}
9191

9292
private Optional<GithubModelSourceConfig> buildGithubModelSourceConfig(
93-
final ResolverConfigurationMixin.GitHubResolverOptions options, final String gitHubToken ) {
93+
final ResolverConfigurationMixin.GitHubResolverOptions options, final String globalGitHubToken ) {
9494
if ( options.gitHubName == null ) {
9595
return Optional.empty();
9696
}
@@ -104,7 +104,7 @@ private Optional<GithubModelSourceConfig> buildGithubModelSourceConfig(
104104
return Optional.of( GithubModelSourceConfigBuilder.builder()
105105
.repository( repository )
106106
.directory( options.gitHubDirectory )
107-
.token( gitHubToken )
107+
.token( options.token != null ? globalGitHubToken : options.token )
108108
.build() );
109109
}
110110

tools/samm-cli/src/main/java/org/eclipse/esmf/ResolverConfigurationMixin.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@ public static class GitHubResolverOptions {
6262
description = "Set the GitHub tag"
6363
)
6464
public String gitHubTag = null;
65+
66+
@CommandLine.Option(
67+
names = { "--token", "-gt" },
68+
description = "Set the GitHub token for the specific repository"
69+
)
70+
public String token = null;
6571
}
6672

6773
// This option is intentionally outside the GitHubResolverOptions argument group so it can be used when resolving Aspect Models

0 commit comments

Comments
 (0)