Skip to content

Commit

Permalink
Bump Go to 1.22 (#1029)
Browse files Browse the repository at this point in the history
  • Loading branch information
pgimalac authored Aug 20, 2024
1 parent b0711ba commit 45bdd74
Show file tree
Hide file tree
Showing 15 changed files with 27 additions and 25 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

FROM public.ecr.aws/docker/library/python:3.12-slim-bullseye AS base

ENV GO_VERSION=1.21.5
ENV GO_SHA=e2bc0b3e4b64111ec117295c088bde5f00eeed1567999ff77bc859d7df70078e
ENV GO_VERSION=1.22.6
ENV GO_SHA=999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616
ENV HELM_VERSION=3.12.3
ENV HELM_SHA=1b2313cd198d45eab00cc37c38f6b1ca0a948ba279c29e322bdf426d406129b5
ARG CI_UPLOADER_SHA=873976f0f8de1073235cf558ea12c7b922b28e1be22dc1553bf56162beebf09d
Expand Down
22 changes: 12 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ This repository contains IaC code based on Pulumi to provision dynamic test infr

To run scripts and code in this repository, you will need:

* [Go](https://golang.org/doc/install) 1.19 or later. You'll also need to set your `$GOPATH` and have `$GOPATH/bin` in your path.
* Python 3.9+ along with development libraries for tooling.
* `account-admin` role on AWS `agent-sandbox` account. Ensure it by running
- [Go](https://golang.org/doc/install) 1.22 or later. You'll also need to set your `$GOPATH` and have `$GOPATH/bin` in your path.
- Python 3.9+ along with development libraries for tooling.
- `account-admin` role on AWS `agent-sandbox` account. Ensure it by running

```bash
aws-vault login sso-agent-sandbox-account-admin
```
Expand All @@ -27,7 +27,7 @@ sudo apt install libnotify-bin
1. Clone this repository

```bash
cd ~/dd && git clone git@github.com:DataDog/test-infra-definitions.git
cd ~/dd && git clone git@github.com:DataDog/test-infra-definitions.git
```

2. Install Python dependencies
Expand All @@ -50,7 +50,6 @@ inv setup

### Create an environment for manual tests


Invoke tasks help deploying most common environments - VMs, Docker, ECS, EKS. Run `inv -l` to learn more.

```bash
Expand Down Expand Up @@ -88,11 +87,12 @@ Run any `-h` on any of the available tasks for more information
Pulumi requires to store/retrieve the state of your `Stack`.
In Pulumi, `Stack` objects represent your actual deployment:
- A `Stack` references a `Project` (a folder with a `Pulumi.yaml`, for instance root folder of this repo)
- A `Stack` references a configuration file called `Pulumi.<stack_name>.yaml`
This file holds your `Stack` configuration.
If it does not exist, it will be created.
If it exists and you input some settings through the command line, using `-c`, it will update the `Stack` file.
This file holds your `Stack` configuration.
If it does not exist, it will be created.
If it exists and you input some settings through the command line, using `-c`, it will update the `Stack` file.
When performing operations on a `Stack`, Pulumi will need to store a state somewhere (the Stack state).
Normally the state should be stored in a durable storage (e.g. S3-like), but for testing purposes
Expand Down Expand Up @@ -170,8 +170,10 @@ pulumi up -c scenario=aws/eks -c ddinfra:aws/defaultKeyPairName=<your_exisiting_
## Troubleshooting
### Environment and configuration
The `setup.debug` invoke task will check for common mistakes such as key unavailable in configured AWS region, ssh-agent not running, invalid key format, and more.
```
aws-vault exec sso-agent-sandbox-account-admin -- inv setup.debug
aws-vault exec sso-agent-sandbox-account-admin -- inv setup --debug --no-interactive
```
```
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21 AS builder
FROM golang:1.22 AS builder

WORKDIR /usr/src/app

Expand Down
2 changes: 1 addition & 1 deletion components/datadog/apps/dogstatsd/images/dogstatsd/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module dogstatsd

go 1.21
go 1.22

require github.com/DataDog/datadog-go/v5 v5.5.0

Expand Down
2 changes: 1 addition & 1 deletion components/datadog/apps/logger/images/logger/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21 AS builder
FROM golang:1.22 AS builder

WORKDIR /usr/src/app

Expand Down
2 changes: 1 addition & 1 deletion components/datadog/apps/logger/images/logger/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module logger

go 1.21
go 1.22

require (
github.com/spf13/pflag v1.0.5
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21 AS builder
FROM golang:1.22 AS builder

WORKDIR /usr/src/app

Expand Down
2 changes: 1 addition & 1 deletion components/datadog/apps/nginx/images/http-client/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module nginx-query

go 1.21
go 1.22
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21 AS builder
FROM golang:1.22 AS builder

WORKDIR /usr/src/app

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module prometheus

go 1.21
go 1.22

require github.com/prometheus/client_golang v1.18.0

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21 AS builder
FROM golang:1.22 AS builder

WORKDIR /usr/src/app

Expand Down
2 changes: 1 addition & 1 deletion components/datadog/apps/redis/images/redis-client/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module redis-query

go 1.21
go 1.22

require github.com/redis/go-redis/v9 v9.4.0

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21 AS builder
FROM golang:1.22 AS builder

WORKDIR /usr/src/app

Expand Down
2 changes: 1 addition & 1 deletion components/datadog/apps/tracegen/images/tracegen/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module tracegen

go 1.21.3
go 1.22

require (
golang.org/x/time v0.3.0
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/DataDog/test-infra-definitions

go 1.22.0
go 1.22

require (
github.com/DataDog/datadog-agent/pkg/util/optional v0.55.2
Expand Down

0 comments on commit 45bdd74

Please sign in to comment.