mirror of
https://github.com/containers/podman.git
synced 2025-10-11 00:06:32 +08:00
b765c91580
This commit implements the --replace functionality for the artifact add command, allowing users to replace existing artifacts without having to manually remove them first. Changes made: - Add Replace field to ArtifactAddOptions entity types - Add --replace CLI flag with validation to prevent conflicts with --append - Implement replace logic in ABI backend to remove existing artifacts before adding - Update API handlers and tunnel implementation for podman-remote support - Add comprehensive documentation and examples to man page - Add e2e and system BATS tests for --replace functionality - Fix code formatting in pkg/bindings/artifacts/types_pull_options.go: * Reorder imports with proper spacing * Fix function declaration spacing * Convert spaces to proper tab indentation * Remove extraneous blank lines The --replace option follows the same pattern as other podman replace options like 'podman container create --replace' and 'podman pod create --replace'. It gracefully handles cases where no existing artifact exists (no error thrown). Usage examples: podman artifact add --replace quay.io/myimage/artifact:latest /path/to/file podman artifact add --replace localhost/test/artifact /tmp/newfile.txt Fixes: Implements requested --replace functionality for artifact add command Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
108 lines
3.5 KiB
Bash
108 lines
3.5 KiB
Bash
#!/usr/bin/env bats -*- bats -*-
|
|
#
|
|
# Tests for podman artifact created date functionality
|
|
#
|
|
|
|
load helpers
|
|
|
|
# Create temporary artifact file for testing
|
|
function create_test_file() {
|
|
local content="$1"
|
|
local filename=$(random_string 12)
|
|
local filepath="$PODMAN_TMPDIR/$filename.txt"
|
|
echo "$content" > "$filepath"
|
|
echo "$filepath"
|
|
}
|
|
|
|
function setup() {
|
|
basic_setup
|
|
skip_if_remote "artifacts are not remote"
|
|
}
|
|
|
|
function teardown() {
|
|
run_podman artifact rm --all --ignore || true
|
|
basic_teardown
|
|
}
|
|
|
|
@test "podman artifact inspect shows created date in RFC3339" {
|
|
local content="test content for created date"
|
|
local testfile=$(create_test_file "$content")
|
|
local artifact_name="localhost/test/created-test"
|
|
|
|
# Record time before creation (in seconds for comparison)
|
|
local before_epoch=$(date +%s)
|
|
|
|
# Create artifact
|
|
run_podman artifact add $artifact_name "$testfile"
|
|
|
|
# Record time after creation (in seconds for comparison)
|
|
local after_epoch=$(date +%s)
|
|
|
|
# Inspect the artifact
|
|
run_podman artifact inspect $artifact_name
|
|
local output="$output"
|
|
|
|
# Parse the JSON output to get the created annotation
|
|
local created_annotation
|
|
created_annotation=$(echo "$output" | jq -r '.Manifest.annotations["org.opencontainers.image.created"]')
|
|
|
|
# Verify created annotation exists and is not null
|
|
assert "$created_annotation" != "null" "Should have org.opencontainers.image.created annotation"
|
|
assert "$created_annotation" != "" "Created annotation should not be empty"
|
|
|
|
# Verify it's a valid RFC3339 timestamp by trying to parse it
|
|
# Convert to epoch for comparison
|
|
local created_epoch
|
|
created_epoch=$(date -d "$created_annotation" +%s 2>/dev/null)
|
|
|
|
# Verify parsing succeeded
|
|
assert "$?" -eq 0 "Created timestamp should be valid RFC3339 format"
|
|
|
|
# Verify timestamp is within reasonable bounds
|
|
assert "$created_epoch" -ge "$before_epoch" "Created time should be after before_epoch"
|
|
assert "$created_epoch" -le "$after_epoch" "Created time should be before after_epoch"
|
|
|
|
# Clean up
|
|
rm -f "$testfile"
|
|
}
|
|
|
|
@test "podman artifact append preserves original created date" {
|
|
local content1="initial content"
|
|
local content2="appended content"
|
|
local testfile1=$(create_test_file "$content1")
|
|
local testfile2=$(create_test_file "$content2")
|
|
local artifact_name="localhost/test/append-test"
|
|
|
|
# Create initial artifact
|
|
run_podman artifact add $artifact_name "$testfile1"
|
|
|
|
# Get the original created timestamp
|
|
run_podman artifact inspect $artifact_name
|
|
local original_created
|
|
original_created=$(echo "$output" | jq -r '.Manifest.annotations["org.opencontainers.image.created"]')
|
|
|
|
# Wait a bit to ensure timestamps would differ if created new
|
|
sleep 1
|
|
|
|
# Append to artifact
|
|
run_podman artifact add --append $artifact_name "$testfile2"
|
|
|
|
# Get the created timestamp after append
|
|
run_podman artifact inspect $artifact_name
|
|
local current_created
|
|
current_created=$(echo "$output" | jq -r '.Manifest.annotations["org.opencontainers.image.created"]')
|
|
|
|
# Verify the created timestamp is preserved
|
|
assert "$current_created" = "$original_created" "Created timestamp should be preserved during append"
|
|
|
|
# Verify we have 2 layers now
|
|
local layer_count
|
|
layer_count=$(echo "$output" | jq '.Manifest.layers | length')
|
|
assert "$layer_count" -eq 2 "Should have 2 layers after append"
|
|
|
|
# Clean up
|
|
rm -f "$testfile1" "$testfile2"
|
|
}
|
|
|
|
# vim: filetype=sh
|