Skip to content

Commit f2de0b4

Browse files
authored
Merge branch 'main' into log-2-logger
2 parents e9068d4 + c07e687 commit f2de0b4

File tree

48 files changed

+1234
-831
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1234
-831
lines changed
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: Bug report
2+
description: Create a report to help us improve.
3+
title: "[BUG]"
4+
labels: ["bug"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Verify that the issue is not already reported, looking at the [currently open issues](https://github.com/polaris-catalog/polaris/issues), use the `Filter` field to narrow down your search.
10+
11+
Please provide a title above with a short, concise summary - don't leave it "empty".
12+
13+
Do **NOT** share any sensitive information like password, security tokens, private URLs etc.
14+
15+
- type: checkboxes
16+
attributes:
17+
label: "Is this a possible security vulnerability?"
18+
description: "If yes, then STOP here and contact security@polaris.io instead!"
19+
options:
20+
- label: "This is NOT a possible security vulnerability"
21+
required: true
22+
23+
- type: textarea
24+
attributes:
25+
label: "Describe the bug"
26+
description: "A clear and concise description of what the bug is."
27+
validations:
28+
required: true
29+
30+
- type: textarea
31+
attributes:
32+
label: "To Reproduce"
33+
description: "Steps to reproduce the behavior"
34+
placeholder: |
35+
1. Go to '...'
36+
2. Click on '...'
37+
3. Scroll down to '...'
38+
4. See error
39+
40+
- type: textarea
41+
attributes:
42+
label: "Actual Behavior"
43+
placeholder: "How the system currently behaves"
44+
45+
- type: textarea
46+
attributes:
47+
label: "Expected Behavior"
48+
placeholder: "How the system should behave"
49+
50+
- type: textarea
51+
attributes:
52+
label: "Additional context"
53+
description: "More information, text, screenshots, etc"
54+
placeholder: "Enter additional helpful information here"
55+
56+
- type: textarea
57+
attributes:
58+
label: "System information"
59+
description: "Information about the environment in which the bug occurs"
60+
placeholder: |
61+
OS: [e.g. Linux, macOS or Windows]
62+
Polaris Catalog Version: [e.g. 0.3.0]
63+
Object storage & setup: [e.g. AWS S3, region, Minio]
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Feature request
2+
description: Suggest an idea for this project
3+
title: "[FEATURE REQUEST]"
4+
labels: enhancement
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Verify that the feature request is not already reported, looking at the [currently open issues](https://github.com/polaris-catalog/polaris/issues), use the `Filter` field to narrow down your search.
10+
11+
Please provide a title above with a short, concise summary - don't leave it "empty".
12+
13+
Do **NOT** share any sensitive information like password, security tokens, private URLs etc.
14+
15+
- type: textarea
16+
attributes:
17+
label: Is your feature request related to a problem? Please describe.
18+
placeholder: |
19+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
20+
21+
- type: textarea
22+
attributes:
23+
label: Describe the solution you'd like
24+
placeholder: |
25+
A clear and concise description of what you want to happen.
26+
27+
- type: textarea
28+
attributes:
29+
label: Describe alternatives you've considered
30+
placeholder: |
31+
A clear and concise description of any alternative solutions or features you've considered.
32+
33+
- type: textarea
34+
attributes:
35+
label: Additional context
36+
placeholder: |
37+
Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ gradle/wrapper/gradle-wrapper-*.sha256
4545

4646
# Gradle
4747
/.gradle
48+
/build-logic/.gradle
4849
**/build/
4950
!src/**/build/
5051

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# Base Image
1717
# Use a non-docker-io registry, because pulling images from docker.io is
1818
# subject to aggressive request rate limiting and bandwidth shaping.
19-
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime as build
19+
FROM registry.access.redhat.com/ubi9/openjdk-21:1.20-2.1721752936 as build
2020

2121
# Copy the REST catalog into the container
2222
COPY --chown=default:root . /app
@@ -28,7 +28,7 @@ RUN rm -rf build
2828
# Build the rest catalog
2929
RUN ./gradlew --no-daemon --info clean shadowJar
3030

31-
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime
31+
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.20-2.1721752928
3232
WORKDIR /app
3333
COPY --from=build /app/polaris-service/build/libs/polaris-service-1.0.0-all.jar /app
3434
COPY --from=build /app/polaris-server.yml /app

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ Running in Docker
5757

5858
Running in Kubernetes
5959
- `./setup.sh` - To run Polaris as a mini-deployment locally. This will create two pods that bind themselves to port `8181`.
60-
- `kubectl get pods` - To check the status of the pods.
61-
- `kubectl get deployment` - To check the status of the deployment.
62-
- `kubectl describe deployment polaris-deployment` - To troubleshoot if things aren't working as expected.
60+
- `kubectl port-forward svc/polaris-service -n polaris 8181:8181` - To create a secure connection between a local machine and a pod within the cluster.
61+
- `kubectl get pods -n polaris` - To check the status of the pods.
62+
- `kubectl get deployment -n polaris` - To check the status of the deployment.
63+
- `kubectl describe deployment polaris-deployment -n polaris` - To troubleshoot if things aren't working as expected.
6364

6465
Building docs
6566
- Docs are generated using [Redocly](https://redocly.com/docs/cli/installation). To regenerate them, run the following

extension/persistence/eclipselink/build.gradle renamed to build-logic/build.gradle.kts

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
dependencies {
18-
implementation(project(":polaris-core"))
19-
runtimeOnly(project(":polaris-service"))
20-
implementation(libs.eclipselink)
21-
implementation(platform(libs.dropwizard.bom))
22-
implementation("io.dropwizard:dropwizard-jackson")
23-
implementation(libs.h2) // Different dependencies will be needed for different backend databases
17+
plugins { `kotlin-dsl` }
2418

25-
testImplementation(libs.h2)
26-
testImplementation(testFixtures(project(":polaris-core")))
19+
dependencies {
20+
implementation(gradleKotlinDsl())
21+
implementation(baselibs.errorprone)
22+
implementation(baselibs.idea.ext)
23+
implementation(baselibs.spotless)
2724
}

settings.gradle renamed to build-logic/settings.gradle.kts

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,14 @@
1414
* limitations under the License.
1515
*/
1616

17-
if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21)) {
18-
throw new GradleException("""
19-
20-
Build aborted...
21-
22-
The Apache Polaris build requires Java 21.
23-
24-
25-
""")
17+
dependencyResolutionManagement {
18+
versionCatalogs { create("baselibs") { from(files("../gradle/baselibs.versions.toml")) } }
2619
}
2720

28-
rootProject.name = "polaris"
29-
30-
Properties projects = new Properties()
31-
file("gradle/projects.main.properties").withInputStream { projects.load(it) }
32-
projects.entrySet().forEach {
33-
final def name = it.key as String
34-
include(name)
35-
final def prj = project(":${name}")
36-
prj.name = name
37-
prj.projectDir = file(it.value)
21+
dependencyResolutionManagement {
22+
repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
23+
repositories {
24+
mavenCentral()
25+
gradlePluginPortal()
26+
}
3827
}

0 commit comments

Comments
 (0)