gitlab-labkit 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed4c330d977763fb6063a9caab83352d59f32c46ac10a097f33f468cb06b2ddc
-  data.tar.gz: 558fae5ff6684b13cce03ee9b5f306c949a19c1a44b89c3fcae0567caa8175cc
+  metadata.gz: a972f127411670b92f75299fcd1d597d0fd89e48a6105ac455ba10d4bb80b034
+  data.tar.gz: d92435f9a5065dffc16a4bf41af04964f65771212f1da2966ab51bb25f08bb9e
 SHA512:
-  metadata.gz: f1cd4013a210766f17a988f7922e900b9b00f74089fdde68e143cc718da629bd5d7442248ee47d15d0d7aa513e85eae6d9d642a5ddbfa5eddbe74046f7674cbb
-  data.tar.gz: 22dae3a5fb187c7118f4dd86df667982c1e72ef023d5a52aad1c6c10813845f3128d714973957c3ddca2b436b1419115904ca5bd76510315f57a7a8d3cd48078
+  metadata.gz: bec41580e39640af8956d3ae5923d886395a6b4fdb0b7e1561777e74220e1fc84824af27dac79bc94d0f9fc318e544d3b89fa532b1a4b349a77a942735b3bf27
+  data.tar.gz: 998efc3b825e94fb2ba9c3ba828b566ff1978fde3d45c6e31bd5603a4caac36a849a2ef21515b466ad840a4014c4d5a66828c95248b2df23cdfcceb6acc30d0b

data/.copier-answers.yml

@@ -3,7 +3,7 @@
 # See the project for instructions on how to update the project
 #
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v1.36.0
+_commit: v1.38.0
 _src_path: https://gitlab.com/gitlab-com/gl-infra/common-template-copier.git
 ee_licensed: false
 golang: false

data/.gitlab-ci-asdf-versions.yml

@@ -1,5 +1,5 @@
 # DO NOT MANUALLY EDIT; Run ./scripts/update-asdf-version-variables.sh to update this
 variables:
-    GL_ASDF_RUBY_VERSION: "3.4.7"
+    GL_ASDF_RUBY_VERSION: "3.4.8"
     GL_ASDF_SHELLCHECK_VERSION: "0.11"
     GL_ASDF_SHFMT_VERSION: "3.12"

data/.gitlab-ci.yml

@@ -19,13 +19,13 @@ include:
   # It includes standard checks, gitlab-scanners, validations and release processes
   # common to all projects using this template library.
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/templates/standard.md
-  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/standard-build@v2.78
+  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/standard-build@v3.4
 
   # Runs rspec tests and rubocop on the project
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/templates/ruby.md
-  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/ruby-build@v2.78
+  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/ruby-build@v3.4
 
-  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/danger@v2.78
+  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/danger@v3.4
 
 .test_template: &test_definition
   extends: .with_bundle

data/.pre-commit-config.yaml

@@ -25,7 +25,7 @@ repos:
   # Documentation available at
   # https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/docs/pre-commit.md
   - repo: https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks
-    rev: v3.0  # renovate:managed
+    rev: v3.4  # renovate:managed
 
     hooks:
       - id: shellcheck  # Run shellcheck for changed Shell files

data/.tool-versions

@@ -1,3 +1,3 @@
-ruby 3.4.7
+ruby 3.4.8
 shfmt 3.12
 shellcheck 0.11

data/lib/labkit/logging/json_logger.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require "time"
+require "date"
 require "logger"
 require "json"
 
@@ -52,7 +53,7 @@ module Labkit
           data[:message] = message
         when Hash
           reject_reserved_log_keys!(message)
-          format_time!(data)
+          format_time!(message)
           data.merge!(message)
         end
 
@@ -81,11 +82,23 @@ module Labkit
 
       def format_time!(hash)
         hash.each do |key, value|
-          if value.is_a?(Time)
-            hash[key] = value.utc.iso8601(3)
-          elsif value.is_a?(Hash)
-            format_time!(value)
-          end
+          hash[key] = convert_time_value(value)
+        end
+      end
+
+      def convert_time_value(value)
+        case value
+        when Time
+          value.utc.iso8601(3)
+        when DateTime
+          value.to_time.utc.iso8601(3)
+        when Hash
+          format_time!(value)
+          value
+        when Array
+          value.map { |v| convert_time_value(v) }
+        else
+          value
         end
       end
     end

data/scripts/prepare-dev-env.sh

@@ -53,8 +53,11 @@ fi
 
 # install mise/asdf dependencies
 echo "installing required plugins with mise install.."
-mise plugins update
+mise plugins update -q
 mise install
+
+# set PROMPT_COMMAND to empty value for mise if unset
+: "${PROMPT_COMMAND:=}"
 eval "$(mise activate bash)"
 
 # pre-commit is optional

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-labkit
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Andrew Newdigate
@@ -555,7 +555,6 @@ files:
 - lib/labkit/user_experience_sli/null.rb
 - lib/labkit/user_experience_sli/registry.rb
 - renovate.json
-- scripts/install-asdf-plugins.sh
 - scripts/prepare-dev-env.sh
 - scripts/update-asdf-version-variables.sh
 homepage: https://gitlab.com/gitlab-org/labkit-ruby

data/scripts/install-asdf-plugins.sh

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-# Vendored from https://gitlab.com/gitlab-com/gl-infra/common-template-copier
-# Consider contributing upstream when updating this file
-
-# This file is deprecated: going forward running `mise install` should be sufficient.
-
-set -euo pipefail
-IFS=$'\n\t'
-
-echo >&2 -e "2024-08-07: this file is deprecated: going forward, simply run 'mise install' to install plugins."
-echo >&2 -e "Recommended reading: https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/docs/developer-setup.md"
-
-mise install