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

Tweak ConfigNotFoundException class #4821

Merged
merged 4 commits into from
Jul 20, 2021
Merged

Tweak ConfigNotFoundException class #4821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67bafd8
Tweak ConfigNotFoundException class
ChristopheDuong Jul 15, 2021
1a76aa6
Add Airbyte server version env variable
ChristopheDuong Jul 19, 2021
e71f48d
Fix NPE when exception is raised
ChristopheDuong Jul 19, 2021
fe74b2d
Use internal_api_host env variable
ChristopheDuong Jul 20, 2021
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
4 changes: 4 additions & 0 deletions airbyte-config/models/src/main/java/io/airbyte/config/Configs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ public interface Configs {

String getAirbyteVersion();

String getAirbyteApiUrl();

int getAirbyteApiPort();

String getAirbyteVersionOrWarning();

Path getConfigRoot();
Expand Down
11 changes: 11 additions & 0 deletions airbyte-config/models/src/main/java/io/airbyte/config/EnvConfigs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public class EnvConfigs implements Configs {

public static final String AIRBYTE_ROLE = "AIRBYTE_ROLE";
public static final String AIRBYTE_VERSION = "AIRBYTE_VERSION";
public static final String INTERNAL_API_HOST = "INTERNAL_API_HOST";
public static final String WORKER_ENVIRONMENT = "WORKER_ENVIRONMENT";
public static final String WORKSPACE_ROOT = "WORKSPACE_ROOT";
public static final String WORKSPACE_DOCKER_MOUNT = "WORKSPACE_DOCKER_MOUNT";
Expand Down Expand Up @@ -91,6 +92,16 @@ public String getAirbyteRole() {
return getEnv(AIRBYTE_ROLE);
}

@Override
public String getAirbyteApiUrl() {
return getEnsureEnv(INTERNAL_API_HOST).split(":")[0];
}

@Override
public int getAirbyteApiPort() {
return Integer.parseInt(getEnsureEnv(INTERNAL_API_HOST).split(":")[1]);
}

@Override
public String getAirbyteVersion() {
return getEnsureEnv(AIRBYTE_VERSION);
Expand Down
12 changes: 8 additions & 4 deletions ...nfig/persistence/src/main/java/io/airbyte/config/persistence/ConfigNotFoundException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,24 @@

public class ConfigNotFoundException extends Exception {

private ConfigSchema type;
private final String type;
private final String configId;

public ConfigNotFoundException(ConfigSchema type, String configId) {
public ConfigNotFoundException(String type, String configId) {
super(String.format("config type: %s id: %s", type, configId));
this.type = type;
this.configId = configId;
}

public ConfigNotFoundException(ConfigSchema type, String configId) {
this(type.toString(), configId);
}

public ConfigNotFoundException(ConfigSchema type, UUID uuid) {
this(type, uuid.toString());
this(type.toString(), uuid.toString());
}

public ConfigSchema getType() {
public String getType() {
return type;
}

Expand Down
2 changes: 1 addition & 1 deletion airbyte-server/src/main/java/io/airbyte/server/errors/InvalidInputExceptionMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static InvalidInputExceptionInfo infoFromConstraints(ConstraintViolationE
props.add(new InvalidInputProperty()
.propertyPath(cv.getPropertyPath().toString())
.message(cv.getMessage())
.invalidValue(cv.getInvalidValue().toString()));
.invalidValue(cv.getInvalidValue() != null ? cv.getInvalidValue().toString() : "null"));
}
exceptionInfo.validationErrors(props);
return exceptionInfo;
Expand Down