Skip to content

Commit

Permalink
Bump version: 0.28.2-alpha → 0.29.0-alpha (#5063)
Browse files Browse the repository at this point in the history
* Bump version: 0.28.2-alpha → 0.29.0-alpha

* update acceptance test
  • Loading branch information
cgardens authored Jul 29, 2021
1 parent bc7ae49 commit 58e9f19
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.28.2-alpha
current_version = 0.29.0-alpha
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?
Expand Down
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=0.28.2-alpha
VERSION=0.29.0-alpha

# Airbyte Internal Job Database, see https://docs.airbyte.io/operator-guides/configuring-airbyte-db
DATABASE_USER=docker
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
package io.airbyte.test.automaticMigrationAcceptance;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
Expand Down Expand Up @@ -58,7 +60,6 @@
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.UUID;
import java.util.function.Consumer;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
Expand Down Expand Up @@ -180,13 +181,11 @@ private void assertSourceDefinitionInformation(ApiClient apiClient) throws ApiEx
boolean foundMysqlSourceDefinition = false;
boolean foundPostgresSourceDefinition = false;
for (SourceDefinitionRead sourceDefinitionRead : sourceDefinitions) {
if (sourceDefinitionRead.getSourceDefinitionId().toString()
.equals("435bb9a5-7887-4809-aa58-28c27df0d7ad")) {
if (sourceDefinitionRead.getSourceDefinitionId().toString().equals("435bb9a5-7887-4809-aa58-28c27df0d7ad")) {
assertEquals(sourceDefinitionRead.getName(), "MySQL");
assertEquals(sourceDefinitionRead.getDockerImageTag(), "0.2.0");
foundMysqlSourceDefinition = true;
} else if (sourceDefinitionRead.getSourceDefinitionId().toString()
.equals("decd338e-5647-4c0b-adf4-da0e75f5a750")) {
} else if (sourceDefinitionRead.getSourceDefinitionId().toString().equals("decd338e-5647-4c0b-adf4-da0e75f5a750")) {
String[] tagBrokenAsArray = sourceDefinitionRead.getDockerImageTag().replace(".", ",").split(",");
assertEquals(3, tagBrokenAsArray.length);
assertTrue(Integer.parseInt(tagBrokenAsArray[0]) >= 0);
Expand All @@ -208,15 +207,15 @@ private void assertDestinationDefinitionInformation(ApiClient apiClient) throws
boolean foundPostgresDestinationDefinition = false;
boolean foundLocalCSVDestinationDefinition = false;
boolean foundSnowflakeDestinationDefintion = false;
for (DestinationDefinitionRead destinationDefinitionRead : destinationDefinitions) {
for (final DestinationDefinitionRead destinationDefinitionRead : destinationDefinitions) {
switch (destinationDefinitionRead.getDestinationDefinitionId().toString()) {
case "25c5221d-dce2-4163-ade9-739ef790f503" -> {
assertEquals(destinationDefinitionRead.getName(), "Postgres");
assertEquals(destinationDefinitionRead.getDockerImageTag(), "0.2.0");
assertEquals("Postgres", destinationDefinitionRead.getName());
assertEquals("0.2.0", destinationDefinitionRead.getDockerImageTag());
foundPostgresDestinationDefinition = true;
}
case "8be1cf83-fde1-477f-a4ad-318d23c9f3c6" -> {
assertEquals(destinationDefinitionRead.getDockerImageTag(), "0.2.0");
assertEquals("0.2.0", destinationDefinitionRead.getDockerImageTag());
assertTrue(destinationDefinitionRead.getName().contains("Local CSV"));
foundLocalCSVDestinationDefinition = true;
}
Expand All @@ -241,20 +240,20 @@ private void assertConnectionInformation(ApiClient apiClient, WorkspaceIdRequest
final ConnectionApi connectionApi = new ConnectionApi(apiClient);
final List<ConnectionRead> connections = connectionApi.listConnectionsForWorkspace(workspaceIdRequestBody).getConnections();
assertEquals(connections.size(), 2);
for (ConnectionRead connection : connections) {
for (final ConnectionRead connection : connections) {
if (connection.getConnectionId().toString().equals("a294256f-1abe-4837-925f-91602c7207b4")) {
assertEquals(connection.getPrefix(), "");
assertEquals(connection.getSourceId().toString(), "28ffee2b-372a-4f72-9b95-8ed56a8b99c5");
assertEquals(connection.getDestinationId().toString(), "4e00862d-5484-4f50-9860-f3bbb4317397");
assertEquals(connection.getName(), "default");
assertEquals(connection.getStatus(), ConnectionStatus.ACTIVE);
assertEquals("", connection.getPrefix());
assertEquals("28ffee2b-372a-4f72-9b95-8ed56a8b99c5", connection.getSourceId().toString());
assertEquals("4e00862d-5484-4f50-9860-f3bbb4317397", connection.getDestinationId().toString());
assertEquals("default", connection.getName());
assertEquals(ConnectionStatus.ACTIVE, connection.getStatus());
assertNull(connection.getSchedule());
} else if (connection.getConnectionId().toString().equals("49dae3f0-158b-4737-b6e4-0eed77d4b74e")) {
assertEquals(connection.getPrefix(), "");
assertEquals(connection.getSourceId().toString(), "28ffee2b-372a-4f72-9b95-8ed56a8b99c5");
assertEquals(connection.getDestinationId().toString(), "5434615d-a3b7-4351-bc6b-a9a695555a30");
assertEquals(connection.getName(), "default");
assertEquals(connection.getStatus(), ConnectionStatus.ACTIVE);
assertEquals("", connection.getPrefix());
assertEquals("28ffee2b-372a-4f72-9b95-8ed56a8b99c5", connection.getSourceId().toString());
assertEquals("5434615d-a3b7-4351-bc6b-a9a695555a30", connection.getDestinationId().toString());
assertEquals("default", connection.getName());
assertEquals(ConnectionStatus.ACTIVE, connection.getStatus());
assertNull(connection.getSchedule());
} else {
fail("Unknown sync " + connection.getConnectionId().toString());
Expand All @@ -264,18 +263,22 @@ private void assertConnectionInformation(ApiClient apiClient, WorkspaceIdRequest

private WorkspaceIdRequestBody assertWorkspaceInformation(ApiClient apiClient) throws ApiException {
final WorkspaceApi workspaceApi = new WorkspaceApi(apiClient);
WorkspaceIdRequestBody workspaceIdRequestBody = new WorkspaceIdRequestBody().workspaceId(UUID.fromString("5ae6b09b-fdec-41af-aaf7-7d94cfc33ef6"));
WorkspaceRead workspace = workspaceApi.getWorkspace(workspaceIdRequestBody);
assertEquals(workspace.getWorkspaceId().toString(), "5ae6b09b-fdec-41af-aaf7-7d94cfc33ef6");
assertEquals(workspace.getCustomerId().toString(), "17f90b72-5ae4-40b7-bc49-d6c2943aea57");
assertEquals(workspace.getName(), "default");
assertEquals(workspace.getSlug(), "default");
assertEquals(workspace.getInitialSetupComplete(), true);
assertEquals(workspace.getAnonymousDataCollection(), false);
assertEquals(workspace.getNews(), false);
assertEquals(workspace.getSecurityUpdates(), false);
assertEquals(workspace.getDisplaySetupWizard(), false);
return workspaceIdRequestBody;
final WorkspaceRead workspace = workspaceApi.listWorkspaces().getWorkspaces().get(0);
// originally the default workspace started with a hardcoded id. the migration in version 0.29.0
// took that id and randomized it. we want to check that the id is now NOT that hardcoded id and
// that all related resources use the updated workspaceId as well.
assertNotNull(workspace.getWorkspaceId().toString());
assertNotEquals("5ae6b09b-fdec-41af-aaf7-7d94cfc33ef6", workspace.getWorkspaceId().toString());
assertEquals("17f90b72-5ae4-40b7-bc49-d6c2943aea57", workspace.getCustomerId().toString());
assertEquals("default", workspace.getName());
assertEquals("default", workspace.getSlug());
assertEquals(true, workspace.getInitialSetupComplete());
assertEquals(false, workspace.getAnonymousDataCollection());
assertEquals(false, workspace.getNews());
assertEquals(false, workspace.getSecurityUpdates());
assertEquals(false, workspace.getDisplaySetupWizard());

return new WorkspaceIdRequestBody().workspaceId(workspace.getWorkspaceId());
}

@SuppressWarnings("UnstableApiUsage")
Expand Down
2 changes: 1 addition & 1 deletion airbyte-webapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion airbyte-webapp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "airbyte-webapp",
"version": "0.28.2-alpha",
"version": "0.29.0-alpha",
"private": true,
"scripts": {
"start": "react-scripts start",
Expand Down
2 changes: 1 addition & 1 deletion docs/operator-guides/upgrading-airbyte.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ If you are upgrading from (i.e. your current version of Airbyte is) Airbyte ver
Here's an example of what it might look like with the values filled in. It assumes that the downloaded `airbyte_archive.tar.gz` is in `/tmp`.

```bash
docker run --rm -v /tmp:/config airbyte/migration:0.28.2-alpha --\
docker run --rm -v /tmp:/config airbyte/migration:0.29.0-alpha --\
--input /config/airbyte_archive.tar.gz\
--output /config/airbyte_archive_migrated.tar.gz
```
Expand Down
2 changes: 1 addition & 1 deletion kube/overlays/stable-with-resource-limits/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AIRBYTE_VERSION=0.28.2-alpha
AIRBYTE_VERSION=0.29.0-alpha

# Airbyte Internal Database, see https://docs.airbyte.io/operator-guides/configuring-airbyte-db
DATABASE_USER=docker
Expand Down
10 changes: 5 additions & 5 deletions kube/overlays/stable-with-resource-limits/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ bases:

images:
- name: airbyte/seed
newTag: 0.28.2-alpha
newTag: 0.29.0-alpha
- name: airbyte/db
newTag: 0.28.2-alpha
newTag: 0.29.0-alpha
- name: airbyte/scheduler
newTag: 0.28.2-alpha
newTag: 0.29.0-alpha
- name: airbyte/server
newTag: 0.28.2-alpha
newTag: 0.29.0-alpha
- name: airbyte/webapp
newTag: 0.28.2-alpha
newTag: 0.29.0-alpha
- name: temporalio/auto-setup
newTag: 1.7.0

Expand Down
2 changes: 1 addition & 1 deletion kube/overlays/stable/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AIRBYTE_VERSION=0.28.2-alpha
AIRBYTE_VERSION=0.29.0-alpha

# Airbyte Internal Database, see https://docs.airbyte.io/operator-guides/configuring-airbyte-db
DATABASE_USER=docker
Expand Down
10 changes: 5 additions & 5 deletions kube/overlays/stable/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ bases:

images:
- name: airbyte/seed
newTag: 0.28.2-alpha
newTag: 0.29.0-alpha
- name: airbyte/db
newTag: 0.28.2-alpha
newTag: 0.29.0-alpha
- name: airbyte/scheduler
newTag: 0.28.2-alpha
newTag: 0.29.0-alpha
- name: airbyte/server
newTag: 0.28.2-alpha
newTag: 0.29.0-alpha
- name: airbyte/webapp
newTag: 0.28.2-alpha
newTag: 0.29.0-alpha
- name: temporalio/auto-setup
newTag: 1.7.0

Expand Down

0 comments on commit 58e9f19

Please sign in to comment.