Skip to content

Commit

Permalink
apply name change
Browse files Browse the repository at this point in the history
AB#8752
  • Loading branch information
waarg committed Nov 10, 2023
1 parent 4e1d5cf commit 4110e7b
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RKVST observes the [CNCF Community Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md), reproduced below for emphasis.
DataTrails observes the [CNCF Community Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md), reproduced below for emphasis.

### Contributor Code of Conduct

Expand Down Expand Up @@ -32,7 +32,7 @@ Conduct may be permanently removed from the project team.
This code of conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community.

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting an RKVST administrator on <support@rkvst.com>.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting an DataTrails administrator on <support@datatrails.ai>.

This Code of Conduct is adapted from the Contributor Covenant
(http://contributor-covenant.org), version 1.2.0, available at
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Contributing to rkvst-shell #
# Contributing to datatrails-shell #

Thanks for taking the time to contribute to rkvst-shell!
Thanks for taking the time to contribute to datatrails-shell!

Contributing is not limited to writing code and submitting a PR. Feel free to submit an
[issue](https://github.com/rkvst/rkvst-shell/issues/new/choose) or comment on an existing one
[issue](https://github.com/datatrails/datatrails-shell/issues/new/choose) or comment on an existing one
to report a bug, provide feedback, or suggest a new feature.

Of course, contributing code is more than welcome! To keep things simple, if you're fixing a small issue,
Expand Down Expand Up @@ -81,7 +81,7 @@ Once a PR has the necessary approvals, it can be merged.
Here’s how the merge should be handled:
- Once approved the author will be asked to squash all fixup commits generated by the review process.
- Commits and their messages should be consistent - each commit in the PR should form a logical unit with working code.
- The first change requested by a RKVST reviewer will be to reorganise the commits into a clean logical structure.
- The first change requested by a DataTrails reviewer will be to reorganise the commits into a clean logical structure.
- The smaller a PR the more likely and more easily that the change will be approved.
- Any changes requested by a reviewer should be committed as a 'fixup' commit against the original commit in the PR.
- Once approval is granted any 'fixup' commits should be merged into their respective commits using 'git rebase -i --autosquash'.
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019-2022 RKVST
Copyright (c) 2019-2022 DataTrails

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# rkvst-shell
# datatrails-shell

Repository for convenience scripts for the RKVST system.
Repository for convenience scripts for the DataTrails system.

# Development

Expand Down Expand Up @@ -47,21 +47,21 @@ Host *
```
> i.e. 'githubUserHandle' viz:
>
> git clone ssh-githubUserHandle:githubUserHandle/rkvst-shell.git
> git clone ssh-githubUserHandle:githubUserHandle/datatrails-shell.git
>

```bash
mkdir githubUserHandle
cd githubUserHandle
git clone ssh-githubUserHandle:githubUserHandle/rkvst-shell.git
git clone ssh-githubUserHandle:githubUserHandle/datatrails-shell.git
```

Enter the new cloned fork and add the original upstream repo as a remote:

```bash
cd rkvst-shell
git remote add upstream ssh-githubUserHandle:rkvst/rkvst-shell.git
cd datatrails-shell
git remote add upstream ssh-githubUserHandle:datatrails/datatrails-shell.git
git remote -v
```

Expand Down Expand Up @@ -92,11 +92,11 @@ And then test changes with a working set of options:
```bash
task build-scraper
task scrape -- -h
task scrape -- -a "RKVST, Inc" \
-e support@rkvst.com \
task scrape -- -a "DataTrails, Inc" \
-e support@datatrails.ai \
-A Docker \
-c credentials/client_secret \
-u https://app.rkvst.io \
-u https://app.datatrails.ai \
8f8f2467-01fe-48fb-891a-5c0be643cec1 \
aerospike:ce-6.0.0.5
```
Expand Down Expand Up @@ -138,7 +138,7 @@ Push the changes upstream(the set-upstream option is only required the first tim
git push --set-upstream origin dev/githubUserHandle/some-proposed-fix
```

Enter the github ui at https://github.com/rkvst/rkvst-shell and
Enter the github ui at https://github.com/datatrails/datatrails-shell and
generate a pull request.

Reviewers will be notified when a PR is generated and you will receive feedback.
Expand Down
4 changes: 2 additions & 2 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ tasks:
build-scraper:
desc: Build scraper image
cmds:
- docker build --no-cache -f Dockerfile-scraper -t rkvst-shell-scraper .
- docker build --no-cache -f Dockerfile-scraper -t datatrails-shell-scraper .

check:
desc: Standard linting of shell scripts
Expand All @@ -27,6 +27,6 @@ tasks:
-w $(pwd) \
-u $(id -u):$(id -g) \
-e USER \
rkvst-shell-scraper \
datatrails-shell-scraper \
{{.CLI_ARGS}}
10 changes: 5 additions & 5 deletions scripts/sbom_scraper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# Read the docs on syft usage.
#
# Create App registration called "SBOM scraper" following the flow described in
# https://docs.rkvst.com/docs/setup-and-administration/getting-access-tokens-using-app-registrations/#using-the-rkvst-ui-(required-for-first-time-setup)
# https://docs.datatrails.com/docs/setup-and-administration/getting-access-tokens-using-app-registrations/#using-the-datatrails-ui-(required-for-first-time-setup)
# and note down the CLIENT_ID and SECRET.
#
# Copy the SECRET generated to the file specified by ${CLIENTSECRET_FILE} below. This
Expand Down Expand Up @@ -68,11 +68,11 @@ log() {
# ----------------------------------------------------------------------------
# Option parsing
# ----------------------------------------------------------------------------
TOOL_NAME="https://github.com/rkvst/rkvst-shell sbom_scraper.sh"
TOOL_NAME="https://github.com/datatrails/datatrails-shell sbom_scraper.sh"
#
# Set this value and merge the change just before release
TOOL_VERSION="v0.6.2"
TOOL_VENDOR="RKVST Inc"
TOOL_VENDOR="DataTrails Inc"
TOOL_HASH_ALG=SHA-256
TOOL_HASH_CONTENT=$(shasum -a 256 "$0" | cut -d' ' -f1)

Expand All @@ -91,12 +91,12 @@ PRIVACY=PUBLIC
JARFILE=false
UPLOAD=true

URL=https://app.rkvst.io
URL=https://app.datatrails.ai

usage() {
cat >&2 <<EOF
Create a Cyclone DX 1.4 XML SBOM from a docker image and upload to RKVST SBOM Hub
Create a Cyclone DX 1.4 XML SBOM from a docker image and upload to DataTrails SBOM Hub
Usage: sbom_scraper.sh [-a AUTHOR_NAME] [-A COMPONENT_AUTHOR] [-c CLIENT_SECRET_FILE] [-e AUTHOR_EMAIL] [-sp] [-u URL] CLIENT_ID [docker-image:tag|sbom file|jar URL]
Expand Down
4 changes: 2 additions & 2 deletions scripts/tls_client_auth/make-tls-client-cert.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
SCRIPTNAME=$(basename "$0")

AUTHORITY="test"
ARCHIVIST_HOST="app.rkvst-poc.io"
ARCHIVIST_HOST="app.datatrails.ai"
TLSARCHIVIST_HOST="auth.$ARCHIVIST_HOST"

# check that the required tools are installed
Expand All @@ -15,7 +15,7 @@ usage() {
cat >&2 <<EOF
Create and configure a TLS certificate authority and TLS client certificate for
use with RKVST
use with DataTrails
Usage: $SCRIPTNAME [-a AUTHORITY] COMMON_NAME
Expand Down

0 comments on commit 4110e7b

Please sign in to comment.