Skip to content

Commit

Permalink
parent 3138afe
Browse files Browse the repository at this point in the history
author Michael Sorens <msorens@chef.io> 1604676405 -0800
committer Alex Pop <apop@chef.io> 1605705520 +0000

Pin semgrep for custom rules (#4426)

sample-data-service mock infra client data (#4398)

Co-authored-by: Steven Danna <steve@chef.io>

Compliance APIs default to 24h without end_time (#4310)

* Compliance APIs default to 24h without end_time

Signed-off-by: Alex Pop <apop@chef.io>

Fix overlapping

Signed-off-by: Alex Pop <apop@chef.io>

* Update docker test based on new inspec error output

Signed-off-by: Alex Pop <apop@chef.io>

* Remove fmt package

Signed-off-by: Alex Pop <apop@chef.io>

Add option to select last 24h compliance report (#4358)

* Add option to select last 24h compliance report

This commit adds the option to view the last 24h of compliance data. Compliance API endpoints were recently updated to return last 24h window of data if `start_time` and `end_time` are excluded from requests.

Signed-off-by: Scott Christopherson <scott@chef.io>

* Align filters

Signed-off-by: Alex Pop <apop@chef.io>

* Update docker test based on new inspec error output

Signed-off-by: Alex Pop <apop@chef.io>

Co-authored-by: Alex Pop <apop@chef.io>

Add Compliance Knowledge Transfer notes

Signed-off-by: Alex Pop <apop@chef.io>

small updates

Signed-off-by: Alex Pop <apop@chef.io>

before call

Signed-off-by: Alex Pop <apop@chef.io>

before call

Signed-off-by: Alex Pop <apop@chef.io>

added filters and migrations

added some filter types

ingest clarifications

Signed-off-by: Alex Pop <apop@chef.io>

Before second kt call

Signed-off-by: Alex Pop <apop@chef.io>

changes post second call

Signed-off-by: Alex Pop <apop@chef.io>
  • Loading branch information
msorens authored and alexpop committed Nov 18, 2020
1 parent 3138afe commit cbfc480
Show file tree
Hide file tree
Showing 120 changed files with 8,065 additions and 3,346 deletions.
17 changes: 17 additions & 0 deletions .bldr.toml
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ paths = [
"api/config/pg_sidecar/*",
"api/config/postgresql/*",
"api/config/prometheus/*",
"api/config/sample_data/*",
"api/config/secrets/*",
"api/config/session/*",
"api/config/shared/*",
Expand Down Expand Up @@ -392,6 +393,7 @@ paths = [
"api/config/platform/*",
"api/config/postgresql/*",
"api/config/prometheus/*",
"api/config/sample_data/*",
"api/config/secrets/*",
"api/config/session/*",
"api/config/shared/*",
Expand Down Expand Up @@ -477,6 +479,7 @@ paths = [
"api/config/platform/*",
"api/config/postgresql/*",
"api/config/prometheus/*",
"api/config/sample_data/*",
"api/config/secrets/*",
"api/config/session/*",
"api/config/shared/*",
Expand Down Expand Up @@ -1048,6 +1051,20 @@ plan_path = "components/automate-builder-api-proxy"
paths = [
"components/automate-builder-api-proxy/*"
]

[sample-data-service]
plan_path = "components/sample-data-service"
paths = [
"components/sample-data-service/*",
"api/external/annotations/*",
"api/external/iam/*",
"lib/grpc/*",
"lib/io/*",
"lib/logger/*",
"lib/tls/*",
"lib/tracing/*",
"lib/version/*"
]
# GENERATED_HAB_PACKAGE_CONFIG_END

[automate-workflow-ctl]
Expand Down
16 changes: 14 additions & 2 deletions .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ steps:
expeditor:
executor:
docker:
image: returntocorp/semgrep:latest
image: returntocorp/semgrep:0.29.0
entrypoint: semgrep
command: [
"--error",
Expand Down Expand Up @@ -913,7 +913,6 @@ steps:
- gopath-checkout#v1.0.1:
import: github.com/chef/automate


- label: "compliance-service upgrade from Automate v2v6"
command:
- sudo sysctl -w vm.max_map_count=262144 # Needed for ElasticSearch 6
Expand All @@ -940,3 +939,16 @@ steps:
plugins:
- gopath-checkout#v1.0.1:
import: github.com/chef/automate

- label: "[unit] sample-data-service"
command:
- scripts/install_golang.sh
- cd components/sample-data-service
- make static
timeout_in_minutes: 10
retry:
automatic:
limit: 1
expeditor:
executor:
docker:
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ dev/secrets-env.sh
dev/license.jwt
components/automate-deployment/a1-migration/delivery.license
components/automate-deployment/basic-a1/delivery.license
external/secrets/secrets_*
external/common/

backups

Expand Down
24 changes: 24 additions & 0 deletions .studio/sample-data-service
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/bash
#
# Helper methods specific for the sample-data-service

document "start_sample_data_service" <<DOC
Build and start the local sample-data-service
DOC
function start_sample_data_service() {
install_if_missing core/jq-static jq
install_if_missing core/grpcurl grpcurl

build components/sample-data-service/
start_deployment_service
chef-automate dev deploy-some $HAB_ORIGIN/sample-data-service --with-deps
}

document "enable_sample_data_service" <<DOC
Enable the sample-data-service
DOC
function enable_sample_data_service() {
check_if_deployinate_started || return 1
printf "[deployment.v1.svc]\n products = [\"sample-data\"]\n" > /tmp/enable_sample_data_patch.toml
chef-automate config patch /tmp/enable_sample_data_patch.toml
}
1 change: 1 addition & 0 deletions HABITAT_PACKAGES
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,4 @@ automate-minio components/automate-minio
automate-builder-memcached components/automate-builder-memcached
automate-builder-api components/automate-builder-api
automate-builder-api-proxy components/automate-builder-api-proxy
sample-data-service components/sample-data-service
8 changes: 7 additions & 1 deletion api/config/deployment/automate_config.pb.a2svc.go

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

Loading

0 comments on commit cbfc480

Please sign in to comment.