Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed the AzureTenantId in oauth.go #210

Merged
merged 10 commits into from
Apr 16, 2024

Conversation

tubiskasarus
Copy link
Contributor

AzureTenantId was hardcoded as a constant which was linked to ".staging.azuredatabricks.net". Therefore, if the host URL was for example from ".azuredatabricks.net", it failed to detect ClientId. I replaced the const value with a map to find the AzureTenantId based on the DSN host.

@tubiskasaroos
Copy link
Contributor

Apologies for submitting the pull request using my test account. I have now transferred the ownership of the forked repository to my main account. I wanted to clarify this to avoid any suspicion. 🙏

auth/oauth/oauth.go Outdated Show resolved Hide resolved
Signed-off-by: Erfan Mahmoodnejad <[email protected]>
@kravets-levko
Copy link
Contributor

@tubiskasaroos can you please rebase your branch? Looks it contains some irrelevant changes

@tubiskasaroos
Copy link
Contributor

tubiskasaroos commented Apr 16, 2024

@kravets-levko, I’m a bit apprehensive because this is my first time contributing on GitHub. I’ve pushed a change from a forked repository to the original one, and I attempted to rebase and address the previous issue related to signing off. However, I lack confidence in whether my actions were correct. Would it be possible to receive some assistance, or should I create a separate fork and submit another pull request?

@kravets-levko
Copy link
Contributor

kravets-levko commented Apr 16, 2024

@tubiskasaroos sorry if my message feels rude - there was no such intention at all. Of course I can help you.

Go to your fork, select main branch in dropdown. Under that dropdown there's a message "This branch is 2 commits behind databricks/databricks-sql-go:main", and next to it is a "Sync fork" button. Click it and select "Update branch".

Next, go to terminal/command line on your computer, and run these commands:

git checkut main
git pull
git checkout patch-1
git pull
git merge main
git push

There should be no conflicts, but in a case of any - resolve them.

I'll keep an eye on this PR. Please feel free to ping me if any questions.

Sync fork screenshot

image

@kravets-levko
Copy link
Contributor

Much better now 🙂 Thank you!

@kravets-levko kravets-levko merged commit f06515c into databricks:main Apr 16, 2024
2 of 3 checks passed
@tubiskasaroos
Copy link
Contributor

All good. Thank you so much for your help!

atzoum pushed a commit to rudderlabs/sqlconnect-go that referenced this pull request May 20, 2024
….5.4 to 1.5.5 (#66)

Bumps
[github.com/databricks/databricks-sql-go](https://github.com/databricks/databricks-sql-go)
from 1.5.4 to 1.5.5.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/databricks/databricks-sql-go/releases">github.com/databricks/databricks-sql-go's
releases</a>.</em></p>
<blockquote>
<h2>v1.5.5</h2>
<ul>
<li>Fix: handle
<code>nil</code><code>databricks/databricks-sql-go#199</code><a
href="https://github.com/esdrasbeleza"><code>@​esdrasbeleza</code></a>)</li>
<li><code>databricks/databricks-sql-go#217</code><a
href="https://github.com/candiduslynx"><code>@​candiduslynx</code></a>)</li>
<li><code>databricks/databricks-sql-go#215</code><a
href="https://github.com/esdrasbeleza"><code>@​esdrasbeleza</code></a>)</li>
<li><code>databricks/databricks-sql-go#210</code><a
href="https://github.com/tubiskasaroos"><code>@​tubiskasaroos</code></a>)</li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/databricks/databricks-sql-go/compare/v1.5.4...v1.5.5">https://github.com/databricks/databricks-sql-go/compare/v1.5.4...v1.5.5</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/databricks/databricks-sql-go/blob/main/CHANGELOG.md">github.com/databricks/databricks-sql-go's
changelog</a>.</em></p>
<blockquote>
<h2>v1.5.5 (2024-04-16)</h2>
<ul>
<li>Fix: handle
<code>nil</code><code>databricks/databricks-sql-go#199</code><a
href="https://github.com/esdrasbeleza"><code>@​esdrasbeleza</code></a>)</li>
<li><code>databricks/databricks-sql-go#217</code><a
href="https://github.com/candiduslynx"><code>@​candiduslynx</code></a>)</li>
<li><code>databricks/databricks-sql-go#215</code><a
href="https://github.com/esdrasbeleza"><code>@​esdrasbeleza</code></a>)</li>
<li><code>databricks/databricks-sql-go#210</code><a
href="https://github.com/tubiskasaroos"><code>@​tubiskasaroos</code></a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/databricks/databricks-sql-go/commit/697ea4fc9c487676f06b36e53212c9e971a07d36"><code>697ea4f</code></a>
Prepare release v1.5.5 (<a
href="https://redirect.github.com/databricks/databricks-sql-go/issues/219">#219</a>)</li>
<li><a
href="https://github.com/databricks/databricks-sql-go/commit/700d02fdb02864912f900b385ade03849542e949"><code>700d02f</code></a>
feat: Update Apache Arrow to <code>v16</code> (<a
href="https://redirect.github.com/databricks/databricks-sql-go/issues/216">#216</a>)</li>
<li><a
href="https://github.com/databricks/databricks-sql-go/commit/f06515c9c67839b91365fa1def480ae5a494ce26"><code>f06515c</code></a>
Fixed the AzureTenantId in oauth.go (<a
href="https://redirect.github.com/databricks/databricks-sql-go/issues/210">#210</a>)</li>
<li><a
href="https://github.com/databricks/databricks-sql-go/commit/aeb5e5d885adfb4a4caf3dc2008c03d46a8da8de"><code>aeb5e5d</code></a>
Fix Spark parameter creation when passing a <code>nil</code>-value named
parameter to a ...</li>
<li><a
href="https://github.com/databricks/databricks-sql-go/commit/4f9a1a11d657c70c1f8b520cfd4e5e8656f71ccf"><code>4f9a1a1</code></a>
hotfix: Provide content length on file put (<a
href="https://redirect.github.com/databricks/databricks-sql-go/issues/217">#217</a>)</li>
<li><a
href="https://github.com/databricks/databricks-sql-go/commit/42b1542e423300912920b7ad16eabd2dd0236ed7"><code>42b1542</code></a>
Add Kravets Levko to codeowners (<a
href="https://redirect.github.com/databricks/databricks-sql-go/issues/218">#218</a>)</li>
<li><a
href="https://github.com/databricks/databricks-sql-go/commit/7c4ada8ee7fbd260684c0b37e6606d609a32facc"><code>7c4ada8</code></a>
Fix formatting of *float64 parameters (<a
href="https://redirect.github.com/databricks/databricks-sql-go/issues/215">#215</a>)</li>
<li>See full diff in <a
href="https://github.com/databricks/databricks-sql-go/compare/v1.5.4...v1.5.5">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/databricks/databricks-sql-go&package-manager=go_modules&previous-version=1.5.4&new-version=1.5.5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants