Skip to content

Commit

Permalink
Merge pull request PelicanPlatform#139 from jhiemstrawisc/run-pre-commit
Browse files Browse the repository at this point in the history
Run pre-commit against entire repo
  • Loading branch information
bbockelm authored Sep 16, 2023
2 parents e8f6a43 + 8dab632 commit 28cab32
Show file tree
Hide file tree
Showing 27 changed files with 69 additions and 76 deletions.
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# Your GoReleaser Pro key, if you are using the 'goreleaser-pro' distribution
# GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}

6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#
# Copyright (C) 2023, Pelican Project, Morgridge Institute for Research
#
#
# Licensed under the Apache License, Version 2.0 (the "License"); you
# may not use this file except in compliance with the License. You may
# obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
4 changes: 2 additions & 2 deletions cmd/director.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ var (
Use: "director",
Short: "Launch a Pelican Director",
Long: `Launch a Pelican Director service:
The Pelican Director is the primary mechanism by which clients/caches
can discover the source of a requested resource. It has two endpoints
at /api/v1.0/director/origin/ and /api/v1.0/director/object/, where the
former redirects to the closest origin supporting the object and the
former redirects to the closest origin supporting the object and the
latter redirects to the closest cache. As a shortcut, requests to the
director at /foo/bar will be treated as a request for the object from
cache.`,
Expand Down
8 changes: 4 additions & 4 deletions cmd/namespace_registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ var (
Use: "registry",
Short: "Interact with a Pelican namespace registry service",
Long: `Interact with a Pelican namespace registry service:
The namespace registry lies at the core of Pelican's security model
by serving as the central point for clients to fetch the public keys
associated with namespaced resources. When origins wish to claim a
namespace prefix in their federation, they securely associate the
public key of their issuer with the namespace registry (many origins
may act as their own issuer). Sometimes origins will provide
additional OIDC metadata if the origins wish to be accessible to the
may act as their own issuer). Sometimes origins will provide
additional OIDC metadata if the origins wish to be accessible to the
OSDF's caching infrastructure. Services wishing to validate the
authenticity of a token from an issuer can then reference the
authenticity of a token from an issuer can then reference the
namespace registry's listed public key for that origin and verify
that it was signed by the correct private key.
`,
Expand Down
32 changes: 16 additions & 16 deletions cmd/resources/xrootd.cfg
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#
# Copyright (C) 2023, Pelican Project, Morgridge Institute for Research
#
#
# Licensed under the Apache License, Version 2.0 (the "License"); you
# may not use this file except in compliance with the License. You may
# obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -26,11 +26,11 @@ xrd.tlsca certdir {{.TLSCertDir}}
{{else}}
xrd.tlsca certfile {{.TLSCertFile}}
{{end}}
http.exthandler xrdmacaroons libXrdMacaroons.so
http.exthandler xrdmacaroons libXrdMacaroons.so
macaroons.secretkey {{.MacaroonsKeyFile}}
ofs.authlib ++ libXrdMacaroons.so
http.header2cgi Authorization authz
http.secxtractor /usr/lib64/libXrdVoms.so
ofs.authlib ++ libXrdMacaroons.so
http.header2cgi Authorization authz
http.secxtractor /usr/lib64/libXrdVoms.so
http.staticpreload http://static/robots.txt {{.RobotsTxtFile}}
{{if .Sitename}}
all.sitename {{.Sitename}}
Expand All @@ -44,19 +44,19 @@ xrootd.monitor all auth flush 30s window 5s fstat 60 lfn ops xfr 5 dest redir fs
all.adminpath {{.XrootdRun}}
all.pidpath {{.XrootdRun}}
oss.localroot {{.Mount}}
xrootd.seclib libXrdSec.so
xrootd.seclib libXrdSec.so
sec.protocol ztn
ofs.authorize 1
ofs.authorize 1
acc.audit deny grant
acc.authdb {{.Authfile}}
ofs.authlib ++ libXrdAccSciTokens.so config={{.ScitokensConfig}}
all.export {{.NamespacePrefix}}
{{if .Origin.Multiuser}}
ofs.osslib libXrdMultiuser.so default
ofs.ckslib * libXrdMultiuser.so
ofs.osslib libXrdMultiuser.so default
ofs.ckslib * libXrdMultiuser.so
{{end}}
xrootd.chksum max 2 md5 adler32 crc32
xrootd.trace emsg login stall redirect
pfc.trace info
pss.setopt DebugLevel 1
xrootd.tls all
xrootd.chksum max 2 md5 adler32 crc32
xrootd.trace emsg login stall redirect
pfc.trace info
pss.setopt DebugLevel 1
xrootd.tls all
6 changes: 3 additions & 3 deletions config/resources/defaults.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#
# Copyright (C) 2023, Pelican Project, Morgridge Institute for Research
#
#
# Licensed under the Apache License, Version 2.0 (the "License"); you
# may not use this file except in compliance with the License. You may
# obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
6 changes: 3 additions & 3 deletions config/resources/osdf.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#
# Copyright (C) 2023, Pelican Project, Morgridge Institute for Research
#
#
# Licensed under the Apache License, Version 2.0 (the "License"); you
# may not use this file except in compliance with the License. You may
# obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
8 changes: 4 additions & 4 deletions docs/parameters.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#
# Copyright (C) 2023, Pelican Project, Morgridge Institute for Research
#
#
# Licensed under the Apache License, Version 2.0 (the "License"); you
# may not use this file except in compliance with the License. You may
# obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -28,7 +28,7 @@ type: filename
---
name: TLSCertificate
description: >-
The name of a file containing an X.509 host certificate to use for TLS
The name of a file containing an X.509 host certificate to use for TLS
authentication when running server components of Pelican.
type: filename
root_default: /etc/pelican/certificates/tls.crt
Expand Down
8 changes: 3 additions & 5 deletions images/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/bin/bash
#
# Copyright (C) 2023, Pelican Project, Morgridge Institute for Research
#
#
# Licensed under the Apache License, Version 2.0 (the "License"); you
# may not use this file except in compliance with the License. You may
# obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -28,5 +28,3 @@ if [ "$1" ]; then
else
echo "A command must be provided"
fi


8 changes: 4 additions & 4 deletions images/supervisord/pelican_director_serve.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#
# Copyright (C) 2023, Pelican Project, Morgridge Institute for Research
#
#
# Licensed under the Apache License, Version 2.0 (the "License"); you
# may not use this file except in compliance with the License. You may
# obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -15,7 +15,7 @@
#

[program:pelican_director_serve]
command=/pelican/osdf-client director serve -p %(ENV_OSDF_DIRECTOR_PORT)s
command=/pelican/osdf-client director serve -p %(ENV_OSDF_DIRECTOR_PORT)s
autostart=false
autorestart=true
redirect_stderr=true
Expand Down
8 changes: 4 additions & 4 deletions images/supervisord/pelican_registry_serve.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#
# Copyright (C) 2023, Pelican Project, Morgridge Institute for Research
#
#
# Licensed under the Apache License, Version 2.0 (the "License"); you
# may not use this file except in compliance with the License. You may
# obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -15,7 +15,7 @@
#

[program:pelican_registry_serve]
command=/pelican/osdf-client registry serve -p %(ENV_OSDF_REGISTRY_PORT)s
command=/pelican/osdf-client registry serve -p %(ENV_OSDF_REGISTRY_PORT)s
autostart=false
autorestart=true
redirect_stderr=true
Expand Down
7 changes: 3 additions & 4 deletions images/supervisord/supervisord.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#
# Copyright (C) 2023, Pelican Project, Morgridge Institute for Research
#
#
# Licensed under the Apache License, Version 2.0 (the "License"); you
# may not use this file except in compliance with the License. You may
# obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -31,4 +31,3 @@ loglevel=debug

[include]
files=/etc/supervisord.d/*.conf

4 changes: 2 additions & 2 deletions origin_ui/src/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Origin UI

This ui is generated with Next.js.
This ui is generated with Next.js.

## Development

Expand All @@ -12,4 +12,4 @@ docker build -t origin-ui .
docker run -it -p 3000:3000 -v $(pwd):/webapp origin-ui npm run dev
```

You can also run if you have node installed locally via `npm install && npm run dev`.
You can also run if you have node installed locally via `npm install && npm run dev`.
2 changes: 1 addition & 1 deletion origin_ui/src/app/initialization/code/CodeInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,4 @@ export default function CodeInput({length, setCode, submitFunction}: CodeInputPr
</Grid>
)

}
}
2 changes: 1 addition & 1 deletion origin_ui/src/app/initialization/code/LoadingButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ export default function LoadingButton({loading, ...props}: LoadingButtonProps) {
{loading ? <CircularProgress size={"1.5rem"}/> : props.children }
</Button>
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ export default function PasswordInput({FormControlProps, TextFieldProps}: Passwo
/>
</FormControl>
)
}
}
2 changes: 1 addition & 1 deletion origin_ui/src/app/initialization/password/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,4 @@ export default function Home() {
</Box>
</>
)
}
}
1 change: 0 additions & 1 deletion origin_ui/src/app/page.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -270,4 +270,3 @@
transform: rotate(0deg);
}
}

2 changes: 1 addition & 1 deletion origin_ui/src/components/layout/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ export const Header = () => {
</div>
</div>
)
}
}
2 changes: 1 addition & 1 deletion origin_ui/src/components/progress-pager.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ export default function ProgressPager({steps, activeStep}: ProgressPagerProps) {
}
</Grid>
)
}
}
2 changes: 1 addition & 1 deletion origin_ui/src/public/next.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion origin_ui/src/public/theme.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ interface ThemeProviderClientProps {

export const ThemeProviderClient: FC<ThemeProviderClientProps> = ({children}) => {
return <ThemeProvider theme={theme}>{children}</ThemeProvider>
}
}
2 changes: 1 addition & 1 deletion origin_ui/src/public/vercel.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions resources/10-stash-plugin.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#
# Copyright (C) 2023, Pelican Project, Morgridge Institute for Research
#
#
# Licensed under the Apache License, Version 2.0 (the "License"); you
# may not use this file except in compliance with the License. You may
# obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
1 change: 0 additions & 1 deletion resources/opensciencegrid.org.pub
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ Dy3YQXwmEPm7kAZwIsEbMa0PNkp85IDkdR1GpvRvDMCRmUaRHrQUPBwPIjs0akL+
qoTxJs9k6quV0g3Wd8z65s/k5mEZ+AnHHI0+0CL3y80wnuLSBYmw05YBtKyoa1Fb
FQIDAQAB
-----END PUBLIC KEY-----

7 changes: 3 additions & 4 deletions resources/update-namespaces.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/bin/bash
#
# Copyright (C) 2023, Pelican Project, University of Wisconsin-Madison
#
#
# Licensed under the Apache License, Version 2.0 (the "License"); you
# may not use this file except in compliance with the License. You may
# obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down Expand Up @@ -46,4 +46,3 @@ jq --sort-keys . namespaces.json.raw > namespaces.json.formatted ||
mv -f namespaces.json.formatted namespaces.json ||
fail $? "Move failed"
rm -f namespaces.json.raw

Loading

0 comments on commit 28cab32

Please sign in to comment.