You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "w0ut0 (via GitHub)" <gi...@apache.org> on 2024/08/12 09:05:53 UTC
[PR] also try to fetch Tenant Id from extra_dejson.tenantId instead of ext… [airflow]
w0ut0 opened a new pull request, #41400:
URL: https://github.com/apache/airflow/pull/41400
…ra_dejson.tenant_id
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you 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. See the License for the
specific language governing permissions and limitations
under the License.
-->
<!--
Thank you for contributing! Please make sure that your code changes
are covered with tests. And in case of new features or big changes
remember to adjust the documentation.
Feel free to ping committers for the review!
In case of an existing issue, reference it using one of the following:
closes: #ISSUE
related: #ISSUE
How to write a good git commit message:
http://chris.beams.io/posts/git-commit/
-->
<!-- Please keep an empty line above the dashes. -->
---
**^ Add meaningful description above**
Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#pull-request-guidelines)** for more information.
In case of fundamental code changes, an Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals)) is needed.
In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
In case of backwards incompatible changes please leave a note in a newsfragment file, named `{pr_number}.significant.rst` or `{issue_number}.significant.rst`, in [newsfragments](https://github.com/apache/airflow/tree/main/newsfragments).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] also try to fetch Tenant Id from extra_dejson.tenantId instead of ext… [airflow]
Posted by "dabla (via GitHub)" <gi...@apache.org>.
dabla commented on PR #41400:
URL: https://github.com/apache/airflow/pull/41400#issuecomment-2284387706
> So it seems that the MS Graph operator does not expect an Azure Connection, but rather an HTTP connection, with extra_dejson `tenantId`. Would it be ok if I do a check on `conn.conn_type`?
>
> ```
> if conn.conn_type == 'http':
> tenant_id = config.get("tenant_id")
> elif conn.conn_type == 'azure':
> tenant_id = config.get("tenantId")
> ```
>
> My use case is that we use the same credentials (service principals) to authenticate the Airflow instance, both to the Azure Resource Manager, as well as to the MS Graph API.
>
> Alternatively, we can raise an exception if the supplied `conn_id` is of the wrong type?
>
> cc @dabla
We could raise an exception once the MSGraph operator would require an Azure connection type, something that would be nice once all parameters vould also be specified in the Azure connection type.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] also try to fetch Tenant Id from extra_dejson.tenantId instead of ext… [airflow]
Posted by "dabla (via GitHub)" <gi...@apache.org>.
dabla commented on code in PR #41400:
URL: https://github.com/apache/airflow/pull/41400#discussion_r1714057486
##########
airflow/providers/microsoft/azure/hooks/msgraph.py:
##########
@@ -190,7 +190,7 @@ def get_conn(self) -> RequestAdapter:
client_id = connection.login
client_secret = connection.password
config = connection.extra_dejson if connection.extra else {}
- tenant_id = config.get("tenant_id")
+ tenant_id = config.get("tenantId") or config.get("tenant_id")
Review Comment:
@w0ut0 thanks for your PR. I would do following:
tenant_id = config.get(“tenant_id”) or config.get(“tenantId”)
No need to check the connection type. I would like to also use the Azure connection type in the future for the MSGraphAsyncOperator as that would make more sense but then some changes would not to be done on the Azure connection type. This would also be interesting for the PR regarding the PowerBi dataset operator of @ambika-garg. But as I said that would require some changes in the Azure connection type, something I didn’t want to mess with yet when I introduced the MSGraphOperator.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] also try to fetch Tenant Id from extra_dejson.tenantId instead of ext… [airflow]
Posted by "dabla (via GitHub)" <gi...@apache.org>.
dabla commented on PR #41400:
URL: https://github.com/apache/airflow/pull/41400#issuecomment-2331397387
@eladkal I think you can close this one, I've added the support in this [PR](https://github.com/apache/airflow/pull/41331).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] also try to fetch Tenant Id from extra_dejson.tenantId instead of ext… [airflow]
Posted by "w0ut0 (via GitHub)" <gi...@apache.org>.
w0ut0 commented on PR #41400:
URL: https://github.com/apache/airflow/pull/41400#issuecomment-2284283303
So it seems that the MSGRAPH provider does not expect an Azure Connection, but rather an HTTP connection.
Would it be ok if I do a check on `conn.conn_type`?
```
if conn.conn_type == 'http':
tenant_id = config.get("tenant_id")
elif conn.conn_type == 'azure':
tenant_id = config.get("tenantId")
```
My use case is that we use the same credentials (service principals) to authenticate the Airflow instance, both to the Azure Resource Manager, as well as to the MS Graph API.
Alternatively, we can raise an exception if the supplied `conn_id` is of the wrong type?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] also try to fetch Tenant Id from extra_dejson.tenantId instead of ext… [airflow]
Posted by "eladkal (via GitHub)" <gi...@apache.org>.
eladkal closed pull request #41400: also try to fetch Tenant Id from extra_dejson.tenantId instead of ext…
URL: https://github.com/apache/airflow/pull/41400
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] also try to fetch Tenant Id from extra_dejson.tenantId instead of ext… [airflow]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #41400:
URL: https://github.com/apache/airflow/pull/41400#issuecomment-2430545098
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed in 5 days if no further activity occurs. Thank you for your contributions.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] also try to fetch Tenant Id from extra_dejson.tenantId instead of ext… [airflow]
Posted by "eladkal (via GitHub)" <gi...@apache.org>.
eladkal commented on code in PR #41400:
URL: https://github.com/apache/airflow/pull/41400#discussion_r1713528855
##########
airflow/providers/microsoft/azure/hooks/msgraph.py:
##########
@@ -190,7 +190,7 @@ def get_conn(self) -> RequestAdapter:
client_id = connection.login
client_secret = connection.password
config = connection.extra_dejson if connection.extra else {}
- tenant_id = config.get("tenant_id")
+ tenant_id = config.get("tenantId") or config.get("tenant_id")
Review Comment:
If we want to change this then we should deprecate the old one.
But also, lets verify all settings. We should not mix two types of syntax's.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org