Skip to content

Commit f864c51

Browse files
committed
Merge remote-tracking branch 'origin/master' into upgrade-spark-operator-2.1.1
Signed-off-by: Kevin Liao <q85292542000@gmail.com>
2 parents 665f220 + 91d6af1 commit f864c51

18 files changed

Lines changed: 180 additions & 139 deletions

File tree

.github/dco.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
require:
2+
members: false
3+
allowRemediationCommits:
4+
individual: true
5+
thirdParty: true

CONTRIBUTING.md

Lines changed: 122 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,124 @@
11
# Contributing to Flyte
22

3-
For information related to contributing to Flyte, please check out the [Contributing to Flyte](https://docs.flyte.org/en/latest/community/contribute/index.html) section of the documentation.
4-
5-
## Recommendation Order (For Beginners)
6-
* Setup dev environment
7-
* Read the following and run at least 5 examples. Pay close attention to the generated outputs, the Graph view, task
8-
logs, etc. Repeat with as many examples as you need to have an initial understanding of what an execution looks like:
9-
* https://docs.flyte.org/en/latest/user_guide/introduction.html
10-
* https://docs.flyte.org/en/latest/flytesnacks/userguide.html
11-
* Finish reading the [Concepts](https://docs.flyte.org/en/latest/user_guide/concepts/main_concepts/index.html)
12-
* Finish reading the [Control Plane](https://docs.flyte.org/en/latest/user_guide/concepts/control_plane/index.html)
13-
* Finish reading the [Component Architecture](https://docs.flyte.org/en/latest/user_guide/concepts/component_architecture/index.html)
14-
* Choose 2 good first issues from the following and start solving them with the knowledge you have read.
15-
* Familiar with using [ImageSpec to push images to localhost for development](https://docs.flyte.org/en/latest/user_guide/customizing_dependencies/imagespec.html#image-spec-example)
3+
First off, thanks for taking the time to contribute! ❤️
4+
5+
All types of contributions are encouraged and valued. See the [Table of Contents](#table-of-contents) for different ways to help and details about how this project handles them. Please make sure to read the relevant section before making your contribution. It will make it a lot easier for the team and smooth out the experience for all involved. The community looks forward to your contributions. 🎉
6+
7+
If you don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation, which we would also be very happy about:
8+
9+
- Star the project
10+
- Post on X or Linkedin about Flyte `#flyte
11+
- Mention the project at local meetups and tell your friends/colleagues
12+
13+
## Table of Contents
14+
15+
- [Code of Conduct](#code-of-conduct)
16+
- [I Have a Question](#i-have-a-question)
17+
- [I Want To Contribute](#i-want-to-contribute)
18+
- [Code Contributors](#code-contributors)
19+
- [Recommendation Order (For Beginners)](#recommendation-order-for-beginners)
20+
- [Reporting Bugs](#reporting-bugs)
21+
- [Feature Requests](#feature-requests)
22+
- [Improving The Documentation](#improving-the-documentation)
23+
- [Improving The Design](#improving-the-design)
24+
- [Publish a Blog Post or Case Study](#publish-a-blog-post-or-case-study)
25+
- [Commit Messages](#commit-messages)
26+
- [Pull requests](#pull-requests)
27+
- [Contributor Ladder](#contributor-ladder)
28+
29+
## Code of Conduct
30+
31+
This project and everyone participating in it is governed by the [Code of Conduct](https://github.com/flyteorg/flyte/blob/master/CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior
32+
to [security@union.ai](mailto:security@union.ai).
33+
34+
## I Have a Question
35+
36+
If you need clarification after reading this document, we encourage you to join our [slack](https://slack.flyte.org/) workspace and join channels [#flyte-support](https://flyte-org.slack.com/archives/CP2HDHKE1) and [#contribute](https://flyte-org.slack.com/archives/C04NJPLRWUX) channel.
37+
38+
## I Want To Contribute
39+
40+
### Code Contributors
41+
42+
We’re excited that you’re interested in contributing code to Flyte! Before you start, please take a look at our [Quickstart](https://www.union.ai/docs/v2/flyte/user-guide/quickstart/) docs, it includes setup instructions, build steps, and details on running your first workflow locally.
43+
44+
#### Recommendation Order (For Beginners)
45+
46+
- Finish reading [Core Concepts](https://www.union.ai/docs/v2/flyte/user-guide/core-concepts/)
47+
- Finish reading [Connecting a Cluster](https://www.union.ai/docs/v2/flyte/user-guide/connecting-to-a-cluster/)
48+
- Finish reading [Projects and Domain](https://www.union.ai/docs/v2/flyte/user-guide/projects-and-domains/)
49+
- Finish reading [From Flyte 1 to Flyte 2](https://www.union.ai/docs/v2/flyte/user-guide/flyte-2/)
50+
51+
### Reporting Bugs
52+
53+
Please use our issues templates that provide hints on what information we need to help you.
54+
55+
> You must never report security related issues, vulnerabilities or bugs including sensitive information to the issue tracker, or elsewhere in public. Instead sensitive bugs must be sent by email to [security@union.ai](mailto:security@union.ai) or use the Report a security vulnerability issue template.
56+
57+
### Feature Requests
58+
59+
Suggest an idea for the project by using the [Issues template](https://github.com/flyteorg/flyte/issues) and choose your desired option and kindly provide as much context as you can about what you're running into. Do not open issues for questions or support, instead join our [slack workspace](https://slack.flyte.org/) and ask there.
60+
61+
Unsure if your contribution is “small”, “large” or whether it fits into the project's goal? Kindly start a quick [discussion](https://github.com/flyteorg/flyte/discussions) on github.
62+
63+
### Improving The Documentation
64+
65+
If you notice outdated information or areas that could be clarified, kindly start a discussion in the [contribute](https://flyte-org.slack.com/archives/C04NJPLRWUX) channel on slack. For more information, please checkout [Contributing to documentation](https://www.union.ai/docs/v2/flyte/community/#contributing-to-documentation).
66+
67+
### Improving The Design
68+
69+
Design contributions are welcome! To ensure smooth collaboration, please use the UI Feature Request Template when opening a design-related issue. This helps us gather the right context (such as wireframes, mockups, or visual references) and maintain a consistent design language across the project. Feedback and iterations are highly encouraged, design is always a shared process.
70+
71+
### Publish a Blog Post or Case Study
72+
73+
We love hearing how people use or extend Flyte in their own projects. If you’ve written about your experience, we’re happy to review it! To share your work, please start a discussion in the [#contribute](https://flyte-org.slack.com/archives/C04NJPLRWUX) channel on slack, summarizing your post or case study, with a link to the full content.
74+
75+
### Commit Messages
76+
77+
Writing clear and consistent commit messages helps maintainers understand the purpose of your changes. A good commit message should:
78+
79+
- Be written in the present tense (e.g., Add new feature, not Added new feature)
80+
81+
- Be short (50 characters or less for the summary line)
82+
83+
- Include additional context in the body if needed
84+
85+
- Reference related issue numbers (e.g., Fixes `#123)
86+
87+
- Keep each commit focused on one logical change
88+
89+
## Pull Requests
90+
91+
When you’re ready to contribute your changes, follow these steps to create a clear and reviewable pull request:
92+
93+
- Push your changes to your fork:
94+
95+
```bash
96+
git push origin your-branch-name
97+
```
98+
99+
- Open a Pull Request against the main Flyte Code repository.
100+
101+
- Select "Compare across forks" and choose your fork and branch.
102+
103+
- Fill out the PR template with:
104+
105+
- A clear description of your changes
106+
107+
- Any related issues (e.g., “changed `#123”).
108+
109+
- Testing steps or screenshots (if applicable)
110+
111+
- Notes for reviewers, if special attention is needed.
112+
113+
For more context, kindly read the official [Before Submitting Your PR](https://www.union.ai/docs/v1/flyte/community/contributing-code/#before-submitting-your-pr) docs.
114+
115+
## Contributor Ladder
116+
117+
The Flyte Contributor Ladder is a key resource for understanding how to grow within Flyte, outlining expectations, responsibilities, and progression across roles. It helps create transparency, recognize contributions, and ensure a sustainable and inclusive path for community members to deepen their impact. [Read more](https://github.com/flyteorg/community/blob/main/GOVERNANCE.md#community-roles-and-path-to-maintainership).
118+
119+
120+
Your contributions, big or small help make Flyte better for everyone!🫶
121+
122+
## References
123+
124+
This document was adapted from [https://contributing.md](https://contributing.md/)!

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Go to the [Deployment guide](https://docs.flyte.org/en/latest/deployment/deploym
120120
🧬 **Data lineage**: Track the movement and transformation of data throughout the lifecycle of your data and ML workflows. <br />
121121
📊 **Map tasks**: Achieve parallel code execution with minimal configuration using [map tasks](https://docs.flyte.org/en/latest/user_guide/advanced_composition/map_tasks.html). <br />
122122
🌎 **Multi-tenancy**: Multiple users can share the same platform while maintaining their own distinct data and configurations. <br />
123-
🌟 **Dynamic workflows**: [Build flexible and adaptable workflows](https://docs.flyte.org/en/latest/user_guide/advanced_composition/dynamic_workflows.html) that can change and evolve as needed, making it easier to respond to changing requirements. <br />
123+
🌟 **Dynamic workflows**: [Build flexible and adaptable workflows](https://www.union.ai/docs/v1/flyte/user-guide/core-concepts/workflows/dynamic-workflows) that can change and evolve as needed, making it easier to respond to changing requirements. <br />
124124
⏯️ [Wait](https://docs.flyte.org/en/latest/user_guide/advanced_composition/waiting_for_external_inputs.html) for **external inputs** before proceeding with the execution. <br />
125125
🌳 **Branching**: [Selectively execute branches](https://docs.flyte.org/en/latest/user_guide/advanced_composition/conditionals.html) of your workflow based on static or dynamic data produced by other tasks or input data. <br />
126126
📈 **Data visualization**: Visualize data, monitor models and view training history through plots. <br />

datacatalog/go.mod

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/gofrs/uuid v4.2.0+incompatible
1111
github.com/golang/glog v1.2.5
1212
github.com/golang/protobuf v1.5.4
13-
github.com/jackc/pgconn v1.14.3
13+
github.com/jackc/pgx/v5 v5.9.2
1414
github.com/spf13/cobra v1.9.1
1515
github.com/spf13/pflag v1.0.10
1616
github.com/stretchr/testify v1.11.1
@@ -67,12 +67,8 @@ require (
6767
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
6868
github.com/hashicorp/golang-lru v0.5.4 // indirect
6969
github.com/inconshreveable/mousetrap v1.1.0 // indirect
70-
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
71-
github.com/jackc/pgio v1.0.0 // indirect
7270
github.com/jackc/pgpassfile v1.0.0 // indirect
73-
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
7471
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
75-
github.com/jackc/pgx/v5 v5.9.2 // indirect
7672
github.com/jackc/puddle/v2 v2.2.2 // indirect
7773
github.com/jinzhu/inflection v1.0.0 // indirect
7874
github.com/jinzhu/now v1.1.5 // indirect

datacatalog/go.sum

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -156,19 +156,8 @@ github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+l
156156
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
157157
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
158158
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
159-
github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
160-
github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
161-
github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
162-
github.com/jackc/pgconn v1.14.3 h1:bVoTr12EGANZz66nZPkMInAV/KHD2TxH9npjXXgiB3w=
163-
github.com/jackc/pgconn v1.14.3/go.mod h1:RZbme4uasqzybK2RK5c65VsHxoyaml09lx3tXOcO/VM=
164-
github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
165-
github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
166-
github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc=
167-
github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak=
168159
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
169160
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
170-
github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag=
171-
github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
172161
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
173162
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
174163
github.com/jackc/pgx/v5 v5.9.2 h1:3ZhOzMWnR4yJ+RW1XImIPsD1aNSz4T4fyP7zlQb56hw=
@@ -273,7 +262,6 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE
273262
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
274263
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
275264
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
276-
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
277265
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
278266
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
279267
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
@@ -436,7 +424,6 @@ gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSP
436424
gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
437425
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
438426
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
439-
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
440427
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
441428
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
442429
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

datacatalog/pkg/repositories/errors/postgres.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"reflect"
66

7-
"github.com/jackc/pgconn"
7+
"github.com/jackc/pgx/v5/pgconn"
88
"google.golang.org/grpc/codes"
99
"gorm.io/gorm"
1010

datacatalog/pkg/repositories/gormimpl/tag_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"testing"
77

88
mocket "github.com/Selvatico/go-mocket"
9-
"github.com/jackc/pgconn"
9+
"github.com/jackc/pgx/v5/pgconn"
1010
"github.com/stretchr/testify/assert"
1111
"google.golang.org/grpc/codes"
1212
"gorm.io/gorm"

flyteadmin/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ require (
3232
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99
3333
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0
3434
github.com/gtank/cryptopasta v0.0.0-20170601214702-1f550f6f2f69
35-
github.com/jackc/pgconn v1.14.3
3635
github.com/jackc/pgx/v5 v5.9.2
3736
github.com/lestrrat-go/jwx v1.2.29
3837
github.com/magiconair/properties v1.8.7
@@ -139,10 +138,7 @@ require (
139138
github.com/hashicorp/golang-lru v0.5.4 // indirect
140139
github.com/hashicorp/hcl v1.0.0 // indirect
141140
github.com/inconshreveable/mousetrap v1.1.0 // indirect
142-
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
143-
github.com/jackc/pgio v1.0.0 // indirect
144141
github.com/jackc/pgpassfile v1.0.0 // indirect
145-
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
146142
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
147143
github.com/jackc/puddle/v2 v2.2.2 // indirect
148144
github.com/jcmturner/gofork v1.0.0 // indirect

flyteadmin/go.sum

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,6 @@ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf
788788
github.com/inhies/go-bytesize v0.0.0-20201103132853-d0aed0d254f8/go.mod h1:KrtyD5PFj++GKkFS/7/RRrfnRhAMGQwy75GLCHWrCNs=
789789
github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
790790
github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
791-
github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
792791
github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
793792
github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
794793
github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
@@ -797,13 +796,8 @@ github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsU
797796
github.com/jackc/pgconn v1.3.2/go.mod h1:LvCquS3HbBKwgl7KbX9KyqEIumJAbm1UMcTvGaIf3bM=
798797
github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
799798
github.com/jackc/pgconn v1.6.0/go.mod h1:yeseQo4xhQbgyJs2c87RAXOH2i624N0Fh1KSPJya7qo=
800-
github.com/jackc/pgconn v1.14.3 h1:bVoTr12EGANZz66nZPkMInAV/KHD2TxH9npjXXgiB3w=
801-
github.com/jackc/pgconn v1.14.3/go.mod h1:RZbme4uasqzybK2RK5c65VsHxoyaml09lx3tXOcO/VM=
802-
github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
803799
github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
804800
github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE=
805-
github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc=
806-
github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak=
807801
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
808802
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
809803
github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
@@ -813,8 +807,6 @@ github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvW
813807
github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
814808
github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
815809
github.com/jackc/pgproto3/v2 v2.0.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
816-
github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag=
817-
github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
818810
github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
819811
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
820812
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=

flyteadmin/pkg/repositories/errors/postgres.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ import (
1414
"fmt"
1515
"reflect"
1616

17-
"github.com/jackc/pgconn"
18-
pgxPgconn "github.com/jackc/pgx/v5/pgconn"
17+
"github.com/jackc/pgx/v5/pgconn"
1918
"github.com/prometheus/client_golang/prometheus"
2019
"google.golang.org/grpc/codes"
2120
"gorm.io/gorm"
@@ -72,8 +71,6 @@ func (p *postgresErrorTransformer) ToFlyteAdminError(err error) flyteAdminErrors
7271
// Try things both ways, the two pgconns are different types.
7372
if pqError, ok := err.(*pgconn.PgError); ok {
7473
return p.flyteAdminErrorFromCode(pqError.Code, pqError.Message)
75-
} else if pqError, ok := err.(*pgxPgconn.PgError); ok {
76-
return p.flyteAdminErrorFromCode(pqError.Code, pqError.Message)
7774
}
7875

7976
logger.Debugf(context.Background(), "Unable to cast to pgconn.PgError. Error type: [%v]",

0 commit comments

Comments
 (0)