Skip to content

Commit

Permalink
Re-run 'typos' after rebasing for v7.12-related commits
Browse files Browse the repository at this point in the history
  • Loading branch information
brianaydemir committed Dec 26, 2024
1 parent a03ab5b commit 5672ebd
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/enforce-PR-labelling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
REPO_NAME=$(jq -r '.repository.name' $GITHUB_EVENT_PATH)
TIMELINE_JSON=$(curl -s "https://api.github.com/repos/$REPO_OWNER/$REPO_NAME/issues/$PR_NUMBER/timeline")
# Count the number of times the timeline sees a "connected" event and subract the number of "disconnected" events
# Count the number of times the timeline sees a "connected" event and subtract the number of "disconnected" events
# We might also consider using the "cross-referenced" event in the future if actual connecting/disconnecting is too heavy-handed
LINKED_ISSUES=$(echo "$TIMELINE_JSON" | jq '
reduce .[] as $event (
Expand Down
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ builds:
- goos: darwin
goarch: ppc64le
# Set things up to build a second server binary that enables Lotman. Eventually
# we'll also use this to filter which moduels are built into the binary.
# we'll also use this to filter which modules are built into the binary.
- env:
- CGO_ENABLED=0
goos:
Expand Down
7 changes: 5 additions & 2 deletions _typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
extend-ignore-identifiers-re = [
## Ignore TLAs. Two and three letter acronyms are not worth fixing.
"^[A-Za-z]{2,3}$",
## Ignore the 'dne' identifiers in server_utils/origin_test.go.
"(.*)_dne$",
## Ignore lotman's use of 'ded' for 'dedicated'.
"^ded[A-Z]",
"^[a-z]+Ded",
## Ignore server_utils's use of 'dne' for 'does not exist'.
"_dne$",
]

[default.extend-identifiers]
Expand Down
2 changes: 1 addition & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ func InitConfigDir(v *viper.Viper) {
configDir := v.GetString("ConfigDir")
if configDir == "" {
if IsRootExecution() {
configDir = "/etc/pelican" // We currently don't handle this case in windows, will be revisted in the future
configDir = "/etc/pelican" // We currently don't handle this case in windows, will be revisited in the future
} else {
configDir = getConfigBase()
}
Expand Down
2 changes: 1 addition & 1 deletion docs/parameters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2773,7 +2773,7 @@ description: |+
- `CreationTime`: REQUIRED. A unix timestamp indicating when the lot should begin being considered valid. Times in the future indicate
the lot should not be considered valid until that time.
- `ExpirationTime`: REQUIRED. A unix timestamp indicating when the lot expires. Lots may continue to function after expiration, but lot
data owners should recognize the storage is at-will and may be pre-empted at any time.
data owners should recognize the storage is at-will and may be preempted at any time.
- `DeletionTime`: REQUIRED. A unix timestamp indicating when the lot and its associated data should be deleted.
For example, Lotman could be configured with the "my-policy" policy with the following:
Expand Down
8 changes: 4 additions & 4 deletions images/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ if [ $# -ne 0 ]; then
case "$program_selector" in
pelican)
# Run pelican with the rest of the arguments
echo "Running pelican with arguments: $@"
echo "Running pelican with arguments: $*"
exec tini -- /usr/local/bin/pelican "$@"
# we shouldn't get here
echo >&2 "Exec of tini failed!"
Expand All @@ -93,22 +93,22 @@ if [ $# -ne 0 ]; then
pelican-server)
# Our server-specific binary which may come with additional
# features/system requirements (like Lotman)
echo "Running pelican-server with arguments: $@"
echo "Running pelican-server with arguments: $*"
exec tini -- /usr/local/sbin/pelican-server "$@"
# we shouldn't get here
echo >&2 "Exec of tini failed!"
exit 1
;;
osdf)
# Run osdf with the rest of the arguments
echo "Running osdf with arguments: $@"
echo "Running osdf with arguments: $*"
exec tini -- /usr/local/bin/osdf "$@"
# we shouldn't get here
echo >&2 "Exec of tini failed!"
exit 1
;;
osdf-server)
echo "Running osdf-server with arguments: $@"
echo "Running osdf-server with arguments: $*"
exec tini -- /usr/local/sbin/osdf-server "$@"
# we shouldn't get here
echo >&2 "Exec of tini failed!"
Expand Down
2 changes: 1 addition & 1 deletion launchers/cache_serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func CacheServe(ctx context.Context, engine *gin.Engine, egrp *errgroup.Group, m
// Until https://github.com/PelicanPlatform/lotman/issues/24 is closed, we can only really logic over
// top-level prefixes because enumerating all object "directories" under a given federation prefix is
// infeasible, but is currently the only way to nest namespaces in Lotman such that a sub namespace
// can be assosciated with a top-level prefix.
// can be associated with a top-level prefix.
// To that end, we need to filter out any nested namespaces from the cache server's namespace ads.
uniqueTopPrefixes := server_utils.FilterTopLevelPrefixes(cacheServer.GetNamespaceAds())

Expand Down
4 changes: 2 additions & 2 deletions lotman/lotman_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ func getPolicyMap() (map[string]PurgePolicy, error) {
var policies []PurgePolicy
// Use custom decoder hook to validate fields. This validates all the way down to the bottom of the lot object.
if err := viper.UnmarshalKey(param.Lotman_PolicyDefinitions.GetName(), &policies, viper.DecodeHook(validateFieldsHook())); err != nil {
return policyMap, errors.Wrap(err, "error unmarshaling Lotman policy definitions")
return policyMap, errors.Wrap(err, "error unmarshalling Lotman policy definitions")
}

for _, policy := range policies {
Expand Down Expand Up @@ -655,7 +655,7 @@ func divideRemainingSpace(lotMap *map[string]Lot, totalDiskSpaceB uint64) error
if lot.MPA != nil && lot.MPA.DedicatedGB != nil {
dedicatedGBBytes := gigabytesToBytes(*lot.MPA.DedicatedGB)
// While we check that lot config is valid later, we can't finish dividing space if
// remainintToHwmB dips negative. Can't check for < 0 after subraction because the uint64 will wrap
// remainintToHwmB dips negative. Can't check for < 0 after subtraction because the uint64 will wrap
if remainingToHwmB < dedicatedGBBytes {
return errors.New(fmt.Sprintf("the sum of all lots' dedicatedGB values exceeds the high watermark of %s. This would allow the cache to purge namespaces using less than their dedicated quota", hwmStr))
}
Expand Down
2 changes: 1 addition & 1 deletion lotman/lotman_ui.go
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ func VerifyNewLotToken(lot *Lot, strToken string) (bool, error) {
// and cut out a lot of this cruft

// Get the namespace by querying the director and checking the headers
errMsgPrefix := "the provided token is acceptible, but no owner could be determined because "
errMsgPrefix := "the provided token is acceptable, but no owner could be determined because "

fedInfo, err := config.GetFederation(context.Background())
if err != nil {
Expand Down

0 comments on commit 5672ebd

Please sign in to comment.