Skip to content

Commit

Permalink
apply changes to scripts
Browse files Browse the repository at this point in the history
Signed-off-by: Yuri Shkuro <[email protected]>
  • Loading branch information
yurishkuro committed Aug 12, 2024
1 parent c43dc3e commit de626d0
Show file tree
Hide file tree
Showing 53 changed files with 160 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ ALL_SRC = $(shell find . -name '*.go' \
sort)

# All .sh or .py or Makefile or .mk files that should be auto-formatted and linted.
SCRIPTS_SRC = $(shell find . \( -name '*.sh' -o -name '*.py' -o -name 'Makefile*' \) \
SCRIPTS_SRC = $(shell find . \( -name '*.sh' -o -name '*.py' -o -name '*.mk' -o -name 'Makefile*' -o -name 'Dockerfile*' \) \
-not -path './.git/*' \
-not -path './idl/*' \
-not -path './jaeger-ui/*' \
-type f | \
Expand Down
3 changes: 3 additions & 0 deletions cmd/agent/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

ARG base_image
ARG debug_image

Expand Down
3 changes: 3 additions & 0 deletions cmd/all-in-one/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

ARG base_image
ARG debug_image

Expand Down
3 changes: 3 additions & 0 deletions cmd/anonymizer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

FROM scratch
ARG TARGETARCH
ARG USER_UID=10001
Expand Down
3 changes: 3 additions & 0 deletions cmd/collector/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

ARG base_image
ARG debug_image

Expand Down
3 changes: 3 additions & 0 deletions cmd/es-index-cleaner/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

ARG base_image

FROM $base_image AS release
Expand Down
3 changes: 3 additions & 0 deletions cmd/es-rollover/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

ARG base_image

FROM $base_image AS release
Expand Down
3 changes: 3 additions & 0 deletions cmd/ingester/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

ARG base_image
ARG debug_image

Expand Down
3 changes: 3 additions & 0 deletions cmd/jaeger/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

ARG base_image
ARG debug_image

Expand Down
3 changes: 3 additions & 0 deletions cmd/query/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

ARG base_image
ARG debug_image

Expand Down
3 changes: 3 additions & 0 deletions cmd/remote-storage/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

ARG base_image
ARG debug_image

Expand Down
3 changes: 3 additions & 0 deletions cmd/tracegen/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

FROM scratch
ARG TARGETARCH
ARG USER_UID=10001
Expand Down
3 changes: 3 additions & 0 deletions crossdock/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

FROM scratch
ARG TARGETARCH

Expand Down
3 changes: 3 additions & 0 deletions crossdock/rules.mk
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

XDOCK_YAML=crossdock/docker-compose.yml

JAEGER_COMPOSE_YAML ?= crossdock/jaeger-docker-compose.yml
Expand Down
3 changes: 3 additions & 0 deletions docker-compose/monitor/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

BINARY ?= all-in-one # Default value uses v1 binary

.PHONY: build
Expand Down
3 changes: 3 additions & 0 deletions docker/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

VERSION := 1.0.0

DOCKER_REGISTRY ?= localhost:5000
Expand Down
3 changes: 3 additions & 0 deletions docker/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

FROM alpine:3.20.2 AS cert
RUN apk add --update --no-cache ca-certificates mailcap

Expand Down
3 changes: 3 additions & 0 deletions docker/debug/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

FROM golang:1.22.6-alpine AS build
ARG TARGETARCH
ENV GOPATH /go
Expand Down
3 changes: 3 additions & 0 deletions examples/hotrod/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

FROM scratch
ARG TARGETARCH
EXPOSE 8080 8081 8082 8083
Expand Down
3 changes: 3 additions & 0 deletions pkg/config/tlscfg/testdata/gen-certs.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

# The following commands were used to create the CA, server and client's certificates and keys in this directory used by unit tests.
# These certificates use the Subject Alternative Name extension rather than the Common Name, which will be unsupported in Go 1.15.

Expand Down
3 changes: 3 additions & 0 deletions plugin/storage/cassandra/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

FROM cassandra:5.0

COPY schema/* /cassandra-schema/
Expand Down
3 changes: 3 additions & 0 deletions plugin/storage/cassandra/schema/create.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

function usage {
>&2 echo "Error: $1"
>&2 echo ""
Expand Down
3 changes: 3 additions & 0 deletions plugin/storage/cassandra/schema/docker.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/usr/bin/env bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0
#
# This script is used in the Docker image jaegertracing/jaeger-cassandra-schema
# that allows installing Jaeger keyspace and schema without installing cqlsh.
Expand Down
3 changes: 3 additions & 0 deletions plugin/storage/cassandra/schema/migration/V002toV003.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

# Create a new operation_names_v2 table and copy all data from operation_names table
# Sample usage: KEYSPACE=jaeger_v1 CQL_CMD='cqlsh host 9042 -u test_user -p test_password --request-timeout=3000' bash
# ./v002tov003.sh
Expand Down
3 changes: 3 additions & 0 deletions plugin/storage/cassandra/schema/migration/v001tov002part1.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

set -euo pipefail

function usage {
Expand Down
3 changes: 3 additions & 0 deletions plugin/storage/cassandra/schema/migration/v001tov002part2.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

set -euo pipefail

function usage {
Expand Down
3 changes: 3 additions & 0 deletions scripts/adaptive-sampling-integration-test.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

set -euf -o pipefail

# This script is currently a placeholder.
Expand Down
3 changes: 3 additions & 0 deletions scripts/build-all-in-one-image.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

set -euf -o pipefail

print_help() {
Expand Down
3 changes: 3 additions & 0 deletions scripts/build-crossdock.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

set -euxf -o pipefail

BRANCH=${BRANCH:?'missing BRANCH env var'}
Expand Down
3 changes: 3 additions & 0 deletions scripts/build-upload-a-docker-image.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

set -euf -o pipefail

base_debug_img_arg=""
Expand Down
3 changes: 3 additions & 0 deletions scripts/build-upload-docker-images.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

set -euf -o pipefail

print_help() {
Expand Down
3 changes: 3 additions & 0 deletions scripts/cassandra-integration-test.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

set -uxf -o pipefail

usage() {
Expand Down
3 changes: 3 additions & 0 deletions scripts/check-go-version.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

version_regex='[0-9]\.[0-9][0-9]'
update=false
verbose=false
Expand Down
3 changes: 3 additions & 0 deletions scripts/check-goleak-files.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

set -euo pipefail

bad_pkgs=0
Expand Down
3 changes: 3 additions & 0 deletions scripts/check-semconv-version.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

set -euf -o pipefail

package_name="go.opentelemetry.io/otel/semconv"
Expand Down
3 changes: 3 additions & 0 deletions scripts/compare_metrics.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

import json

v1_metrics_path = "./V1_Metrics.json"
Expand Down
3 changes: 3 additions & 0 deletions scripts/compute-tags.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

# Compute major/minor/etc image tags based on the current branch

set -ef -o pipefail
Expand Down
3 changes: 3 additions & 0 deletions scripts/compute-tags.test.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

# This script uses https://github.com/kward/shunit2 to run unit tests.
# The path to this repo must be provided via SHUNIT2 env var.

Expand Down
3 changes: 3 additions & 0 deletions scripts/dco_check.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

# Script copied from https://github.com/christophebedard/dco-check/blob/master/dco_check/dco_check.py
#
# Copyright 2020 Christophe Bedard
Expand Down
3 changes: 3 additions & 0 deletions scripts/docker-login.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

set -exu

DOCKERHUB_USERNAME=${DOCKERHUB_USERNAME:-"jaegertracingbot"}
Expand Down
3 changes: 3 additions & 0 deletions scripts/draft-release.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env python3

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

import argparse
import re
import subprocess
Expand Down
3 changes: 3 additions & 0 deletions scripts/es-integration-test.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

PS4='T$(date "+%H:%M:%S") '
set -euf -o pipefail

Expand Down
3 changes: 3 additions & 0 deletions scripts/generate-help-output.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

# This script runs the `help` command on all Jaeger binaries (using go run) with variations of SPAN_STORAGE_TYPE.
# It can be used to compare the CLI API changes between releases.

Expand Down
3 changes: 3 additions & 0 deletions scripts/hotrod-integration-test.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

set -euxf -o pipefail

print_help() {
Expand Down
3 changes: 3 additions & 0 deletions scripts/import-order-cleanup.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env python3

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

import argparse

def cleanup_imports_and_return(imports):
Expand Down
3 changes: 3 additions & 0 deletions scripts/kafka-integration-test.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

set -euf -o pipefail

compose_file="docker-compose/kafka-integration-test/docker-compose.yml"
Expand Down
3 changes: 3 additions & 0 deletions scripts/package-deploy.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/bin/bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0
set -euxf -o pipefail

TARCMD=${TARCMD:-tar}
Expand Down
3 changes: 3 additions & 0 deletions scripts/rebuild-ui.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

set -euxf -o pipefail

cd jaeger-ui
Expand Down
3 changes: 3 additions & 0 deletions scripts/release-notes.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env python3

# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

# This script can read N latest commits from one of Jaeger repos
# and output them in the release notes format:
# * {title} ({author} in {pull_request})
Expand Down
Loading

0 comments on commit de626d0

Please sign in to comment.