From 5636096c084ffbfbe2d4de53c0eff6261a10929b Mon Sep 17 00:00:00 2001 From: ITQ Date: Sun, 14 Dec 2025 13:53:32 +0300 Subject: [PATCH] chore: small fixes --- .gitlab-ci.yml | 1 - .gitlab/Dependency-Scanning.v2.gitlab-ci.yml | 120 ------------------- api/proto/competition.proto | 3 - 3 files changed, 124 deletions(-) delete mode 100644 .gitlab/Dependency-Scanning.v2.gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a442700..9617efe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,6 @@ stages: include: - template: Jobs/Container-Scanning.gitlab-ci.yml # - template: Jobs/Dependency-Scanning.gitlab-ci.yml - - local: .gitlab/Dependency-Scanning.v2.gitlab-ci.yml - template: Jobs/SAST-IaC.gitlab-ci.yml - template: Jobs/SAST.gitlab-ci.yml - template: Jobs/Secret-Detection.gitlab-ci.yml diff --git a/.gitlab/Dependency-Scanning.v2.gitlab-ci.yml b/.gitlab/Dependency-Scanning.v2.gitlab-ci.yml deleted file mode 100644 index 1cbfbfb..0000000 --- a/.gitlab/Dependency-Scanning.v2.gitlab-ci.yml +++ /dev/null @@ -1,120 +0,0 @@ -# Read more about this feature here: https://docs.gitlab.com/ee/user/application_security/dependency_scanning/ -# -# Configure dependency scanning with spec:inputs (https://docs.gitlab.com/ci/yaml/#specinputs). -# List of available variables: https://docs.gitlab.com/ee/user/application_security/dependency_scanning/#spec_inputs -spec: - inputs: - # Variables for job behavior. - job_name: - type: string - default: 'dependency-scanning' - description: "The name of the dependency scanning job." - stage: - type: string - default: test - description: "The stage of the dependency scanning job." - allow_failure: - type: boolean - default: true - description: "Whether the dependency scanning job failure should fail the pipeline." - # Default value set to SECURE_ANALYZERS_PREFIX to ensure that global variables applying to AST templates - # work as expected. If $SECURE_ANALYZERS_PREFIX is set globally and this input is supplied, the global - # variable will be preferred. - analyzer_image_prefix: - type: string - default: "$SECURE_ANALYZERS_PREFIX" - description: "The registry url prefix pointing to the repository of the analyzer." - analyzer_image_name: - type: string - default: "dependency-scanning" - description: "The repository of the analyzer image used by the dependency-scanning job." - analyzer_image_version: - type: string - default: "1" - description: "The version of the analyzer image used by the dependency-scanning job." - - # Variables for analyzer behavior. - additional_ca_cert_bundle: - type: string - default: "" - description: "CA certificate bundle to trust. The CA bundle provided here is added to the system's certificates and also used by other tools during the scanning process." - pipcompile_requirements_file_name_pattern: - type: string - default: "" - description: "Custom requirements file name pattern to use when analyzing. The pattern should match file names only, not directory paths. See https://github.com/bmatcuk/doublestar/tree/v1#patterns for syntax details." - max_scan_depth: - type: number - default: 2 - description: "Defines how many directory levels analyzer should search for supported files. A value of -1 means the analyzer will search all directories regardless of depth." - excluded_paths: - type: string - default: "**/spec,**/test,**/tests,**/tmp,**/node_modules,**/.bundle,**/vendor,**/.git" - description: "A comma-separated list of paths (globs supported) to exclude from the scan." - include_dev_dependencies: - type: boolean - default: true - description: "Include development/test dependencies when scanning a supported file." - enable_static_reachability: - type: boolean - default: false - description: "Enable static reachability." - analyzer_log_level: - type: string - default: "info" - description: "Logging level used by the analyzer. The options are fatal, error, warn, info, debug." - enable_vulnerability_scan: - type: boolean - default: true - description: "Enable the vulnerability analysis of generated SBOMs." - vulnerability_scan_api_timeout: - type: number - default: 10 - description: "Vulnerability scanning API request timeout in seconds." - vulnerability_scan_api_download_delay: - type: number - default: 3 - description: "Vulnerability scanning API initial delay in seconds before downloading scan results." - ---- - -variables: - # Setting this variable affects all Security templates - # (SAST, Dependency Scanning, ...) - SECURE_ANALYZERS_PREFIX: "$CI_TEMPLATE_REGISTRY_HOST/security-products" - # Variable used to track the template/compopnent introducing DS analyzer. Please do not override. - # This is an internal variable - INTERNAL_DS_ANALYZER_CI_INTEGRATION: "template::v2" - -"$[[ inputs.job_name ]]": - variables: - DS_ANALYZER_IMAGE: $[[ inputs.analyzer_image_prefix ]]/$[[ inputs.analyzer_image_name ]]:$[[ inputs.analyzer_image_version ]] - image: "$DS_ANALYZER_IMAGE" - stage: $[[ inputs.stage ]] - allow_failure: $[[ inputs.allow_failure ]] - script: - - echo "Using Dependency-Scanning.v2.gitlab-ci.yml" - # Variable fallback for legacy variables used by version 1 of the Dependency Scanning template. - - export ADDITIONAL_CA_CERT_BUNDLE="${ADDITIONAL_CA_CERT_BUNDLE:-$[[ inputs.additional_ca_cert_bundle ]]}" - - export DS_PIPCOMPILE_REQUIREMENTS_FILE_NAME_PATTERN="${DS_PIPCOMPILE_REQUIREMENTS_FILE_NAME_PATTERN:-$[[ inputs.pipcompile_requirements_file_name_pattern ]]}" - - export DS_MAX_DEPTH="${DS_MAX_DEPTH:-$[[ inputs.max_scan_depth ]]}" - - export DS_EXCLUDED_PATHS="${DS_EXCLUDED_PATHS:-$[[ inputs.excluded_paths ]]}" - - export DS_INCLUDE_DEV_DEPENDENCIES="${DS_INCLUDE_DEV_DEPENDENCIES:-$[[ inputs.include_dev_dependencies ]]}" - - export DS_STATIC_REACHABILITY_ENABLED="${DS_STATIC_REACHABILITY_ENABLED:-$[[ inputs.enable_static_reachability ]]}" - - export SECURE_LOG_LEVEL="${SECURE_LOG_LEVEL:-$[[ inputs.analyzer_log_level ]]}" - - export DS_ENABLE_VULNERABILITY_SCAN="${DS_ENABLE_VULNERABILITY_SCAN:-$[[ inputs.enable_vulnerability_scan ]]}" - - export DS_API_TIMEOUT="${DS_API_TIMEOUT:-$[[ inputs.vulnerability_scan_api_timeout ]]}" - - export DS_API_SCAN_DOWNLOAD_DELAY="${DS_API_SCAN_DOWNLOAD_DELAY:-$[[ inputs.vulnerability_scan_api_download_delay ]]}" - - /analyzer run - artifacts: - access: "developer" - paths: - - "**/gl-sbom-*.cdx.json" - - "gl-dependency-scanning-report.json" - reports: - cyclonedx: "**/gl-sbom-*.cdx.json" - dependency_scanning: 'gl-dependency-scanning-report.json' - rules: - - if: '($AST_ENABLE_MR_PIPELINES == "true" || $AST_ENABLE_MR_PIPELINES == null) && $CI_PIPELINE_SOURCE == "merge_request_event"' - - if: '($AST_ENABLE_MR_PIPELINES == "true" || $AST_ENABLE_MR_PIPELINES == null) && $CI_OPEN_MERGE_REQUESTS' - when: never - - if: $CI_COMMIT_BRANCH diff --git a/api/proto/competition.proto b/api/proto/competition.proto index aebc8cc..2d338cb 100644 --- a/api/proto/competition.proto +++ b/api/proto/competition.proto @@ -9,9 +9,6 @@ option go_package = "pkg/api/competition"; service CompetitionService { rpc GetCompetition(GetCompetitionRequest) returns (Competition); rpc ListCompetitions(ListCompetitionsRequest) returns (ListCompetitionsResponse); - rpc CreateCompetition(CreateCompetitionRequest) returns (Competition); - rpc UpdateCompetition(UpdateCompetitionRequest) returns (Competition); - rpc DeleteCompetition(DeleteCompetitionRequest) returns (google.protobuf.Empty); rpc ChangeCompetitionState(ChangeCompetitionStateRequest) returns (Competition); }