Skip to content

fix some samples after releasing v2 #212

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

Merged
alexrashed merged 2 commits into from
May 4, 2023
Merged

fix some samples after releasing v2 #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
995290a
use localstack/localstack-pro, avoid bigdata
alexrashed Mar 28, 2023
7739b99
fix RDS secret
alexrashed Apr 7, 2023
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
6 changes: 3 additions & 3 deletions .github/workflows/makefile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
with:
node-version: 14

# see https://github.com/localstack/localstack/pull/6831
# remove once no longer needed
# see https://github.com/localstack/localstack/pull/6831
# remove once no longer needed
- name: Fix pyOpenSSL version
run: pip install --upgrade pyOpenSSL

Expand All @@ -40,7 +40,7 @@ jobs:
git config --global user.name "Localstack Pro-Samples"

- name: Pull the latest docker image
run: docker pull localstack/localstack
run: docker pull localstack/localstack-pro

- name: Execute tests
env:
Expand Down
1 change: 0 additions & 1 deletion athena-s3-queries/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ install: ## Install dependencies
# @test -e node_modules || npm install
@which localstack || pip install localstack
@which awslocal || pip install awscli-local
docker pull localstack/bigdata

run: ## Set up database connections and run Athena queries locally
@make install; \
Expand Down
2 changes: 1 addition & 1 deletion glue-etl-jobs/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ awslocal glue create-table --database legislators \
awslocal glue create-connection \
--connection-input '{"Name": "'$CONNECTION_NAME'", "ConnectionType": "JDBC", "ConnectionProperties": {"USERNAME": "test", "PASSWORD": "test", "JDBC_CONNECTION_URL": "jdbc:postgresql://localhost.localstack.cloud:'$db_port'"}}'

secret=$(awslocal secretsmanager create-secret --name mysecret --secret-string "12345678" | jq -r ".ARN")
secret=$(awslocal secretsmanager create-secret --name pass --secret-string "test" | jq -r ".ARN")

echo Creating Postgres database tables with data ...
awslocal rds-data execute-statement --resource-arn arn:aws:rds:us-east-1:000000000000:cluster:$CLUSTER_IDENTIFIER --secret-arn $secret --sql 'CREATE TABLE IF NOT EXISTS persons(id varchar, name varchar)'
Expand Down
1 change: 0 additions & 1 deletion glue-redshift-crawler/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ usage: ## Show this help
install: ## Install dependencies
@which localstack || pip install localstack
@which awslocal || pip install awscli-local
docker pull localstack/bigdata

run: ## Prepare environment and run sample
./run.sh
Expand Down
4 changes: 2 additions & 2 deletions java-notification-app/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3.8"
services:
localstack:
container_name: "${LOCALSTACK_DOCKER_NAME-localstack_main}"
image: localstack/localstack
image: localstack/localstack-pro
ports:
- "127.0.0.1:4510-4559:4510-4559" # external service port range
- "127.0.0.1:4566:4566" # LocalStack Edge Proxy
Expand All @@ -15,7 +15,7 @@ services:
- LOCALSTACK_API_KEY=${LOCALSTACK_API_KEY-}
- SMTP_HOST=smtp:1025
volumes:
- "${TMPDIR:-/tmp}/localstack:/tmp/localstack"
- "${LOCALSTACK_VOLUME_DIR:-./volume}:/var/lib/localstack"
- "/var/run/docker.sock:/var/run/docker.sock"

smtp:
Expand Down
2 changes: 1 addition & 1 deletion lambda-mounting-and-debugging/javascript/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3.8"
services:
localstack:
container_name: "${LOCALSTACK_DOCKER_NAME-localstack_main}"
image: localstack/localstack:latest
image: localstack/localstack-pro:latest
ports:
- "127.0.0.1:4566:4566" # LocalStack Gateway
- "127.0.0.1:4510-4559:4510-4559" # external services port range
Expand Down
4 changes: 2 additions & 2 deletions sample-archive/spring-cloud-function-microservice/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ version: "3.8"
services:
localstack:
container_name: "${LOCALSTACK_DOCKER_NAME-localstack_main}"
image: localstack/localstack
image: localstack/localstack-pro
network_mode: bridge
ports:
- "127.0.0.1:53:53"
Expand All @@ -41,5 +41,5 @@ services:
- LAMBDA_JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5050
- LAMBDA_DOCKER_FLAGS=-p 127.0.0.1:5050:5050
volumes:
- "${TMPDIR:-/tmp/}localstack:/tmp/localstack"
- "${LOCALSTACK_VOLUME_DIR:-./volume}:/var/lib/localstack"
- "/var/run/docker.sock:/var/run/docker.sock"
2 changes: 1 addition & 1 deletion testcontainers-java-sample/LocalStackTestcontainers/src/test/java/TestRDS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

public class TestRDS {

private DockerImageName localstackImage = DockerImageName.parse("localstack/localstack:1.4.0");
private DockerImageName localstackImage = DockerImageName.parse("localstack/localstack-pro:latest");
private String api_key = System.getenv("LOCALSTACK_API_KEY");

/**
Expand Down