Skip to content

Commit

Permalink
better input handling
Browse files Browse the repository at this point in the history
  • Loading branch information
@yeoldegrove
yeoldegrove committed Oct 15, 2024
1 parent 33d6786 commit ef63edc
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 28 deletions.
36 changes: 36 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,42 @@ This will generate the following initial release data ...
./glrd-create --generate-initial-releases stable,nightly --input --s3-update
```

### Generate/Update an arbitrary release from JSON data

This will generate/update a release from JSON data and upload it to the default S3 bucket.

```
echo '{
"releases": [
{
"name": "release-1592.1",
"type": "patch",
"version": {
"major": 1592,
"minor": 1
},
"lifecycle": {
"released": {
"isodate": "2024-08-22",
"timestamp": 1724277600
},
"eol": {
"isodate": "2025-08-12",
"timestamp": 1754949600
}
},
"git": {
"commit": "ec945aa995d0f08d64303ff6045b313b40b665fb",
"commit_short": "ec945aa"
},
"github": {
"release": "https://github.com/gardenlinux/gardenlinux/releases/tag/1592.1"
}
}
]
}' | ./glrd-create --input-stdin --s3-update
```

## glrd

The `glrd` script is a command-line utility for querying the GLRD. It allows you to filter and display release information based on various criteria.
Expand Down
69 changes: 41 additions & 28 deletions glrd-create
View file
Original file line number Diff line number Diff line change
Expand Up @@ -511,18 +511,37 @@ def set_latest_minor_eol_to_major(releases):

def load_input(filename):
"""Load manual input from a file if it exists."""
input_data = yaml.safe_load(open(filename, 'r')) if os.path.exists(filename) else {}

# Ensure we're returning the list of releases from the 'releases' key
return input_data.get('releases', [])
try:
input_data = yaml.safe_load(open(filename, 'r'))

merged_releases = input_data.get('releases', [])
if len(merged_releases) == 0:
sys.exit(f"Error, no releases found in JSON from file")
stable_releases = [r for r in merged_releases if r['type'] == 'stable']
patch_releases = [r for r in merged_releases if r['type'] == 'patch']
nightly_releases = [r for r in merged_releases if r['type'] == 'nightly']
dev_releases = [r for r in merged_releases if r['type'] == 'dev']
return stable_releases, patch_releases, nightly_releases, dev_releases
except json.JSONDecodeError as e:
sys.exit(f"Error parsing JSON from file: {str(e)}")
except Exception as e:
sys.exit(f"Error reading input from file: {str(e)}")


def load_input_stdin():
"""Load input from stdin as JSON data."""
try:
stdin_data = sys.stdin.read()
input_data = json.loads(stdin_data)
return input_data.get('releases', [])

merged_releases = input_data.get('releases', [])
if len(merged_releases) == 0:
sys.exit(f"Error, no releases found in JSON from stdin")
stable_releases = [r for r in merged_releases if r['type'] == 'stable']
patch_releases = [r for r in merged_releases if r['type'] == 'patch']
nightly_releases = [r for r in merged_releases if r['type'] == 'nightly']
dev_releases = [r for r in merged_releases if r['type'] == 'dev']
return stable_releases, patch_releases, nightly_releases, dev_releases
except json.JSONDecodeError as e:
sys.exit(f"Error parsing JSON from stdin: {str(e)}")
except Exception as e:
Expand Down Expand Up @@ -740,14 +759,15 @@ if __name__ == "__main__":
dev_releases = [r for r in merged_releases if r['type'] == 'dev']

# Add stdin input or file input data if provided (existing releases will be overwritten)
if args.input_stdin:
input_releases = load_input_stdin()
elif args.input:
input_releases = load_input(args.input_file)
stable_releases = merge_input_data(stable_releases, input_releases)
patch_releases = merge_input_data(patch_releases, input_releases)
nightly_releases = merge_input_data(nightly_releases, input_releases)
dev_releases = merge_input_data(dev_releases, input_releases)
if args.input_stdin or args.input:
if args.input_stdin:
input_stable, input_patch, input_nightly, input_dev = load_input_stdin()
elif args.input:
input_stable, input_patch, input_nightly, input_dev = load_input(args.input_file)
stable_releases = merge_input_data(stable_releases, input_stable)
patch_releases = merge_input_data(patch_releases, input_patch)
nightly_releases = merge_input_data(nightly_releases, input_nightly)
dev_releases = merge_input_data(dev_releases, input_dev)

# Generate nightly releases if requested (needs stable releases)
if generate_initial_nightly:
Expand Down Expand Up @@ -780,39 +800,32 @@ if __name__ == "__main__":
merge_existing_s3_data(bucket_name, f"{bucket_prefix}{os.path.basename(output_file)}", output_file, merged_releases)
upload_to_s3(output_file, bucket_name, f"{bucket_prefix}{os.path.basename(output_file)}")
else:
if args.input or args.input_stdin:
output_file = args.output_file_prefix + '-stable' + '.' + args.output_format
# Handle S3 upload if the argument is provided
save_output_file({'releases': stable_releases}, filename=output_file, format=args.output_format)
if args.s3_update:
merge_existing_s3_data(bucket_name, f"{bucket_prefix}{os.path.basename(output_file)}", output_file, merged_releases)
upload_to_s3(output_file, bucket_name, f"{bucket_prefix}{os.path.basename(output_file)}")
if generate_initial_stable or args.stable:
if len(stable_releases) > 0:
output_file = args.output_file_prefix + '-stable' + '.' + args.output_format
# Handle S3 upload if the argument is provided
save_output_file({'releases': stable_releases}, filename=output_file, format=args.output_format)
if args.s3_update:
merge_existing_s3_data(bucket_name, f"{bucket_prefix}{os.path.basename(output_file)}", output_file, merged_releases)
merge_existing_s3_data(bucket_name, f"{bucket_prefix}{os.path.basename(output_file)}", output_file, stable_releases)
upload_to_s3(output_file, bucket_name, f"{bucket_prefix}{os.path.basename(output_file)}")
if generate_initial_patch or args.patch:
if len(patch_releases) > 0:
output_file = args.output_file_prefix + '-patch' + '.' + args.output_format
# Handle S3 upload if the argument is provided
save_output_file({'releases': patch_releases}, filename=output_file, format=args.output_format)
if args.s3_update:
merge_existing_s3_data(bucket_name, f"{bucket_prefix}{os.path.basename(output_file)}", output_file, merged_releases)
merge_existing_s3_data(bucket_name, f"{bucket_prefix}{os.path.basename(output_file)}", output_file, patch_releases)
upload_to_s3(output_file, bucket_name, f"{bucket_prefix}{os.path.basename(output_file)}")
if generate_initial_nightly or args.nightly:
if len(nightly_releases) > 0:
output_file = args.output_file_prefix + '-nightly' + '.' + args.output_format
save_output_file({'releases': nightly_releases}, filename=output_file, format=args.output_format)
# Handle S3 upload if the argument is provided
if args.s3_update:
merge_existing_s3_data(bucket_name, f"{bucket_prefix}{os.path.basename(output_file)}", output_file, merged_releases)
merge_existing_s3_data(bucket_name, f"{bucket_prefix}{os.path.basename(output_file)}", output_file, nightly_releases)
upload_to_s3(output_file, bucket_name, f"{bucket_prefix}{os.path.basename(output_file)}")
if args.dev:
if len(dev_releases) > 0:
output_file = args.output_file_prefix + '-dev' + '.' + args.output_format
save_output_file({'releases': dev_releases}, filename=output_file, format=args.output_format)
# Handle S3 upload if the argument is provided
if args.s3_update:
merge_existing_s3_data(bucket_name, f"{bucket_prefix}{os.path.basename(output_file)}", output_file, merged_releases)
merge_existing_s3_data(bucket_name, f"{bucket_prefix}{os.path.basename(output_file)}", output_file, dev_releases)
upload_to_s3(output_file, bucket_name, f"{bucket_prefix}{os.path.basename(output_file)}")

0 comments on commit ef63edc

Please sign in to comment.