From 00bcdf756d4ae219fe32098dedc383c87ac029fa Mon Sep 17 00:00:00 2001 From: Davin Chia Date: Thu, 2 Jun 2022 17:08:24 +0800 Subject: [PATCH] Update socat image for ARM compatibility. Update curl image as best practices. --- .../src/main/java/io/airbyte/config/EnvConfigs.java | 4 ++-- .../migrations/V0_39_1_001__CreateStreamReset.java | 2 +- .../java/io/airbyte/oauth/flows/HubspotOAuthFlow.java | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/airbyte-config/models/src/main/java/io/airbyte/config/EnvConfigs.java b/airbyte-config/models/src/main/java/io/airbyte/config/EnvConfigs.java index cfc7ebe0bd409..f81fcb84505b9 100644 --- a/airbyte-config/models/src/main/java/io/airbyte/config/EnvConfigs.java +++ b/airbyte-config/models/src/main/java/io/airbyte/config/EnvConfigs.java @@ -153,9 +153,9 @@ public class EnvConfigs implements Configs { private static final String DEFAULT_JOB_KUBE_SIDECAR_CONTAINER_IMAGE_PULL_POLICY = "IfNotPresent"; private static final String SECRET_STORE_GCP_PROJECT_ID = "SECRET_STORE_GCP_PROJECT_ID"; private static final String SECRET_STORE_GCP_CREDENTIALS = "SECRET_STORE_GCP_CREDENTIALS"; - private static final String DEFAULT_JOB_KUBE_SOCAT_IMAGE = "alpine/socat:1.7.4.1-r1"; + private static final String DEFAULT_JOB_KUBE_SOCAT_IMAGE = "alpine/socat:1.7.4.3-r0"; private static final String DEFAULT_JOB_KUBE_BUSYBOX_IMAGE = "busybox:1.28"; - private static final String DEFAULT_JOB_KUBE_CURL_IMAGE = "curlimages/curl:7.77.0"; + private static final String DEFAULT_JOB_KUBE_CURL_IMAGE = "curlimages/curl:7.83.1"; private static final long DEFAULT_MINIMUM_WORKSPACE_RETENTION_DAYS = 1; private static final long DEFAULT_MAXIMUM_WORKSPACE_RETENTION_DAYS = 60; private static final long DEFAULT_MAXIMUM_WORKSPACE_SIZE_MB = 5000; diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/instance/configs/migrations/V0_39_1_001__CreateStreamReset.java b/airbyte-db/lib/src/main/java/io/airbyte/db/instance/configs/migrations/V0_39_1_001__CreateStreamReset.java index 51be204aca99b..3c93912688565 100644 --- a/airbyte-db/lib/src/main/java/io/airbyte/db/instance/configs/migrations/V0_39_1_001__CreateStreamReset.java +++ b/airbyte-db/lib/src/main/java/io/airbyte/db/instance/configs/migrations/V0_39_1_001__CreateStreamReset.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Airbyte, Inc., all rights reserved. + * Copyright (c) 2022 Airbyte, Inc., all rights reserved. */ package io.airbyte.db.instance.configs.migrations; diff --git a/airbyte-oauth/src/main/java/io/airbyte/oauth/flows/HubspotOAuthFlow.java b/airbyte-oauth/src/main/java/io/airbyte/oauth/flows/HubspotOAuthFlow.java index 923c59995862e..49d061ef100e9 100644 --- a/airbyte-oauth/src/main/java/io/airbyte/oauth/flows/HubspotOAuthFlow.java +++ b/airbyte-oauth/src/main/java/io/airbyte/oauth/flows/HubspotOAuthFlow.java @@ -36,10 +36,11 @@ protected String formatConsentUrl(final UUID definitionId, throws IOException { try { /* - Not all accounts have access to all scopes so we're requesting them as optional. - Hubspot still expects scopes to be defined, so the contacts scope is left as required - as it is accessible by any marketing or CRM account according to https://legacydocs.hubspot.com/docs/methods/oauth2/initiate-oauth-integration#scopes - */ + * Not all accounts have access to all scopes so we're requesting them as optional. Hubspot still + * expects scopes to be defined, so the contacts scope is left as required as it is accessible by + * any marketing or CRM account according to + * https://legacydocs.hubspot.com/docs/methods/oauth2/initiate-oauth-integration#scopes + */ return new URIBuilder(AUTHORIZE_URL) .addParameter("client_id", clientId) .addParameter("redirect_uri", redirectUrl)