Skip to content

Commit bcba212

Browse files
erezrokaherezrokah
authored
Merge branch 'main' into main
2 parents f281a83 + 7603b38 commit bcba212

135 files changed

Lines changed: 4728 additions & 275 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/pr_labeler.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ github:
4646
- plugins/source/github/**/*
4747
gitlab:
4848
- plugins/source/gitlab/**/*
49+
googleads:
50+
- plugins/destination/googleads/**/*
4951
googleanalytics:
5052
- plugins/destination/googleanalytics/**/*
5153
gremlin:

‎.github/workflows/release_summary.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
uses: actions/checkout@v3
1616
with:
1717
fetch-depth: 0
18+
# required so the commit triggers workflow runs
19+
token: ${{ secrets.GH_CQ_BOT }}
1820
- name: Get plugin name
1921
id: plugin
2022
run: |
@@ -108,8 +110,6 @@ jobs:
108110
- uses: stefanzweifel/git-auto-commit-action@v4
109111
if: ${{ steps.get-changes.outputs.result != '' }}
110112
with:
111-
# required so the commit triggers workflow runs
112-
token: ${{ secrets.GH_CQ_BOT }}
113113
commit_message: "chore: Add tables changes to changelog"
114114
file_pattern: "plugins/source/${{ steps.plugin.outputs.name }}/CHANGELOG.md"
115-
author: cq-bot <cq-bot@users.noreply.github.com>
115+
author: cq-bot <cq-bot@users.noreply.github.com>

‎.github/workflows/source_googleads.yml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
name: Source Plugin Google Ads Workflow
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- "plugins/source/googleads/**"
7+
- ".github/workflows/source_googleads.yml"
8+
push:
9+
branches:
10+
- main
11+
paths:
12+
- "plugins/source/googleads/**"
13+
- ".github/workflows/source_googleads.yml"
14+
15+
jobs:
16+
plugins-source-googleads:
17+
timeout-minutes: 30
18+
name: "plugins/source/googleads"
19+
runs-on: ubuntu-latest
20+
defaults:
21+
run:
22+
working-directory: ./plugins/source/googleads
23+
steps:
24+
- uses: actions/checkout@v3
25+
with:
26+
fetch-depth: 2
27+
- name: Set up Go 1.x
28+
uses: actions/setup-go@v3
29+
with:
30+
go-version-file: plugins/source/googleads/go.mod
31+
cache: true
32+
cache-dependency-path: plugins/source/googleads/go.sum
33+
- name: golangci-lint
34+
uses: golangci/golangci-lint-action@v3
35+
with:
36+
version: v1.50.1
37+
working-directory: plugins/source/googleads
38+
args: "--config ../../.golangci.yml"
39+
- name: Get dependencies
40+
run: go get -t -d ./...
41+
- name: gen
42+
if: github.event_name == 'pull_request'
43+
run: make gen
44+
- name: Fail if generation updated files
45+
if: github.event_name == 'pull_request'
46+
run: test "$(git status -s | wc -l)" -eq 0 || (git status -s; exit 1)
47+
- name: Build
48+
run: go build .
49+
- name: Test
50+
run: make test
51+
validate-release:
52+
timeout-minutes: 30
53+
runs-on: ubuntu-latest
54+
env:
55+
CGO_ENABLED: 0
56+
steps:
57+
- name: Checkout
58+
if: startsWith(github.head_ref, 'release-please--branches--main--components') || github.event_name == 'push'
59+
uses: actions/checkout@v3
60+
- uses: actions/cache@v3
61+
if: startsWith(github.head_ref, 'release-please--branches--main--components') || github.event_name == 'push'
62+
with:
63+
path: |
64+
~/.cache/go-build
65+
~/go/pkg/mod
66+
key: ${{ runner.os }}-go-1.19.5-release-cache-${{ hashFiles('plugins/source/googleads/go.sum') }}
67+
restore-keys: |
68+
${{ runner.os }}-go-1.19.5-release-cache-plugins-source-googleads
69+
- name: Set up Go
70+
if: startsWith(github.head_ref, 'release-please--branches--main--components') || github.event_name == 'push'
71+
uses: actions/setup-go@v3
72+
with:
73+
go-version-file: plugins/source/googleads/go.mod
74+
- name: Install GoReleaser
75+
if: startsWith(github.head_ref, 'release-please--branches--main--components') || github.event_name == 'push'
76+
uses: goreleaser/goreleaser-action@v3
77+
with:
78+
distribution: goreleaser-pro
79+
version: latest
80+
install-only: true
81+
- name: Run GoReleaser Dry-Run
82+
if: startsWith(github.head_ref, 'release-please--branches--main--components') || github.event_name == 'push'
83+
run: goreleaser release --snapshot --clean --skip-validate --skip-publish --skip-sign -f ./plugins/source/googleads/.goreleaser.yaml
84+
env:
85+
GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}

‎.release-please-manifest.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"cli": "2.5.2",
33
"cli+FILLER": "0.0.0",
4-
"plugins/source/aws": "15.5.0",
4+
"plugins/source/aws": "15.6.0",
55
"plugins/source/aws+FILLER": "0.0.0",
6-
"plugins/source/azure": "6.0.0",
6+
"plugins/source/azure": "6.1.0",
77
"plugins/source/azure+FILLER": "0.0.0",
88
"plugins/source/cloudflare": "3.2.3",
99
"plugins/source/cloudflare+FILLER": "0.0.0",
@@ -83,7 +83,7 @@
8383
"plugins/destination/mssql+FILLER": "0.0.0",
8484
"plugins/source/plausible": "1.1.2",
8585
"plugins/source/plausible+FILLER": "0.0.0",
86-
"plugins/source/shopify": "1.1.2",
86+
"plugins/source/shopify": "1.1.3",
8787
"plugins/source/shopify+FILLER": "0.0.0",
8888
"plugins/source/stripe": "1.1.2",
8989
"plugins/source/stripe+FILLER": "0.0.0",
@@ -116,5 +116,6 @@
116116
"plugins/source/mysql": "1.0.1",
117117
"plugins/source/mysql+FILLER": "0.0.0",
118118
"plugins/destination/gremlin": "1.0.1",
119-
"plugins/destination/gremlin+FILLER": "0.0.0"
119+
"plugins/destination/gremlin+FILLER": "0.0.0",
120+
"plugins/source/googleads": "1.0.0"
120121
}

‎plugins/destination/clickhouse/CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ To run the tests, you will need a running ClickHouse instance.
1414
You can use the [docker-compose.yaml](docker-compose.yaml) file to start one:
1515

1616
```bash
17-
docker-compose up -d
17+
docker compose up -d
1818
```
1919

2020
This will start a ClickHouse instance and create the `cloudquery` database along with user `cq` (password: `test`).

‎plugins/destination/clickhouse/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# CloudQuery ClickHouse Destination Plugin
22

3-
This destination plugin lets you sync data from any CloudQuery source to a ClickHouse database.
3+
This destination plugin lets you sync data from any [CloudQuery source](https://www.cloudquery.io/docs/plugins/sources)
4+
to a [ClickHouse](https://clickhouse.com) database.
45

56
## Links
67

‎plugins/source/aws/CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,27 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

88

9+
## [15.6.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-aws-v15.5.0...plugins-source-aws-v15.6.0) (2023-03-23)
10+
11+
12+
### Features
13+
14+
* **aws:** Autoscaling Plans ([#9328](https://github.com/cloudquery/cloudquery/issues/9328)) ([b438d31](https://github.com/cloudquery/cloudquery/commit/b438d311a0ac994e3268b4dd739ee2b2d4451997))
15+
16+
17+
### This Release has the Following Changes to Tables
18+
- Table `aws_autoscaling_plan_resources` was added
19+
- Table `aws_autoscaling_plans` was added
20+
21+
### This Release has the Following Changes to Tables
22+
- Table `aws_autoscaling_plan_resources` was added
23+
- Table `aws_autoscaling_plans` was added
24+
25+
### Bug Fixes
26+
27+
* **aws:** Paginate EBS Snapshots for more consistent throughput ([#9374](https://github.com/cloudquery/cloudquery/issues/9374)) ([156013a](https://github.com/cloudquery/cloudquery/commit/156013a358597840b2c312561b09d4a3688e1d45))
28+
* **aws:** Skip backtrack fetching if backtrack is disabled for RDS cluster ([#9352](https://github.com/cloudquery/cloudquery/issues/9352)) ([3109a6c](https://github.com/cloudquery/cloudquery/commit/3109a6c628428c2740461f0c38e183d6baed3774)), closes [#9351](https://github.com/cloudquery/cloudquery/issues/9351)
29+
930
## [15.5.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-aws-v15.4.0...plugins-source-aws-v15.5.0) (2023-03-21)
1031

1132

‎plugins/source/aws/client/client.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,9 @@ type ServicesManager struct {
5959
}
6060

6161
const (
62-
defaultRegion = "us-east-1"
63-
awsFailedToConfigureErrMsg = "failed to retrieve credentials for account %s. AWS Error: %w, detected aws env variables: %s"
64-
awsOrgsFailedToFindMembers = "failed to list Org member accounts. Make sure that your credentials have the proper permissions"
65-
defaultVar = "default"
66-
cloudfrontScopeRegion = defaultRegion
62+
defaultRegion = "us-east-1"
63+
defaultVar = "default"
64+
cloudfrontScopeRegion = defaultRegion
6765
)
6866

6967
var errInvalidRegion = errors.New("region wildcard \"*\" is only supported as first argument")

‎plugins/source/aws/client/mocks/autoscalingplans.go‎

Lines changed: 96 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎plugins/source/aws/client/services.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/aws/aws-sdk-go-v2/service/appsync"
1616
"github.com/aws/aws-sdk-go-v2/service/athena"
1717
"github.com/aws/aws-sdk-go-v2/service/autoscaling"
18+
"github.com/aws/aws-sdk-go-v2/service/autoscalingplans"
1819
"github.com/aws/aws-sdk-go-v2/service/backup"
1920
"github.com/aws/aws-sdk-go-v2/service/batch"
2021
"github.com/aws/aws-sdk-go-v2/service/cloudformation"
@@ -124,6 +125,7 @@ func initServices(region string, c aws.Config) Services {
124125
Appsync: appsync.NewFromConfig(awsCfg),
125126
Athena: athena.NewFromConfig(awsCfg),
126127
Autoscaling: autoscaling.NewFromConfig(awsCfg),
128+
Autoscalingplans: autoscalingplans.NewFromConfig(awsCfg),
127129
Batch: batch.NewFromConfig(awsCfg),
128130
Backup: backup.NewFromConfig(awsCfg),
129131
Cloudformation: cloudformation.NewFromConfig(awsCfg),
@@ -230,6 +232,7 @@ type Services struct {
230232
Appsync services.AppsyncClient
231233
Athena services.AthenaClient
232234
Autoscaling services.AutoscalingClient
235+
Autoscalingplans services.AutoscalingplansClient
233236
Backup services.BackupClient
234237
Batch services.BatchClient
235238
Cloudformation services.CloudformationClient

0 commit comments

Comments
 (0)