Skip to content

Commit 6b060eb

Browse files
committed
Upgrade to elasticsearch 7.12
1 parent 46b3ffa commit 6b060eb

4 files changed

Lines changed: 388 additions & 11 deletions

File tree

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ orbs:
77
jobs:
88
test:
99
docker:
10-
- image: circleci/golang:1.12
10+
- image: circleci/golang:1.15
1111
environment:
1212
- GO111MODULE: "on"
1313
- ELASTICSEARCH_URLS: "http://es:9200"
1414
- ELASTICSEARCH_USERNAME: "elastic"
1515
- ELASTICSEARCH_PASSWORD: "changeme"
16-
- image: docker.elastic.co/elasticsearch/elasticsearch:7.5.1
16+
- image: docker.elastic.co/elasticsearch/elasticsearch:7.12.1
1717
name: es
1818
environment:
1919
- cluster.name: "test"
@@ -38,7 +38,7 @@ jobs:
3838
flags: unittest
3939
build:
4040
docker:
41-
- image: circleci/golang:1.12
41+
- image: circleci/golang:1.15
4242
environment:
4343
- GO111MODULE: "on"
4444
working_directory: /go/src/github.com/disaster37/terraform-provider-elasticsearch
@@ -47,7 +47,7 @@ jobs:
4747
- run: make build
4848
release:
4949
docker:
50-
- image: circleci/golang:1.12
50+
- image: circleci/golang:1.15
5151
environment:
5252
- GO111MODULE: "on"
5353
- GITHUB_TOKEN: $GITHUB_TOKEN

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
name: Set up Go
2929
uses: actions/setup-go@v2
3030
with:
31-
go-version: 1.14
31+
go-version: 1.15
3232
-
3333
name: Import GPG key
3434
id: import_gpg

go.mod

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
module github.com/disaster37/terraform-provider-elasticsearch/v7
22

3-
go 1.12
3+
go 1.15
44

55
require (
6-
github.com/elastic/go-elasticsearch/v7 v7.5.0
7-
github.com/hashicorp/terraform-plugin-sdk v1.7.0
8-
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
9-
github.com/pkg/errors v0.8.1
10-
github.com/sirupsen/logrus v1.4.2
6+
github.com/elastic/go-elasticsearch/v7 v7.12.0
7+
github.com/hashicorp/terraform-plugin-sdk v1.17.2
8+
github.com/pkg/errors v0.9.1
9+
github.com/sirupsen/logrus v1.8.1
1110
github.com/x-cray/logrus-prefixed-formatter v0.5.2
1211
)

0 commit comments

Comments
 (0)