Skip to content

Commit

Permalink
fix schema from pipeline tests
Browse files Browse the repository at this point in the history
  • Loading branch information
fauna-chase committed Nov 7, 2023
1 parent f7d2777 commit 11ecce5
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions src/lib/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ export class ShellConfig {
// root config. In this scenario endpoints may be set by the project
// configuration but won't exist in their pipeline workspace.
if (
endpointName === undefined ||
endpointName === undefined ||
(secretFlag !== undefined && this.rootConfig.isEmpty())
) {
// This is a dummy secret. `--secret` must be set in this case, which
Expand Down Expand Up @@ -290,8 +290,18 @@ export class ShellConfig {
throw new Error(
`No endpoint or secret set. Set an endpoint in ~/.fauna-shell, ${PROJECT_FILE_NAME}, or pass --endpoint`
);
/**
* If there is no secret flag set we need to ensure we validate we can find a secret
* from the endpoint. Additionally if there is a root config present, we
* want to validate that things line up with the project. Even if a secret
* flag is set, there could be other properties of the endpoint that we need to
* pull in, url being the current one.
* The inverse of this is the running from a pipeline scenario where there is a secret
* set and no root config. In that case we don't want to validate the project configuration.
*/
} else if (this.secretFlag === undefined || !this.rootConfig.isEmpty()) {
this.projectConfig?.validate(this.rootConfig);
}
this.projectConfig?.validate(this.rootConfig);
};

lookupEndpoint = (opts: { scope?: string }): EndpointConfig => {
Expand Down

0 comments on commit 11ecce5

Please sign in to comment.