prod image build changes - #21956

Merged
potiuk merged 1 commit into
apache:mainfrom
Bowrna:build-prod-image
Mar 29, 2022
Merged

prod image build changes#21956
potiuk merged 1 commit into
apache:mainfrom
Bowrna:build-prod-image

Conversation

@Bowrna

Copy link
Copy Markdown
Contributor

closes : #21100
related : #21100

This helps to build prod image using Breeze2


^ Add meaningful description above

Read the Pull Request Guidelines for more information.
In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 8 times, most recently from c203235 to 02c063aCompareMarch 8, 2022 08:05
@potiuk

Copy link
Copy Markdown
Member

Looks cool :)

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 12 times, most recently from 841ddf4 to 714b80cCompareMarch 13, 2022 13:36
@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk

if [[ !${INSTALL_AIRFLOW_VERSION}=~ ^[0-9\.]+((a|b|rc|alpha|beta|pre)[0-9]+)?$ ]];then

Can you give me a few example airflow version that matches this pattern?

@potiuk

potiuk commented Mar 14, 2022

Copy link
Copy Markdown
Member

Can you give me a few example airflow version that matches this pattern?

  • 2.0.1alpha1
  • 2.2.2a10
  • 2.3.0rc1
  • 2.2.0.rc3
  • 2.2.3pre0

@Bowrna

Copy link
Copy Markdown
ContributorAuthor
  • 2.2.3pre

@potiuk

  • 2.0.1alpha1
  • 2.3.0rc1
    Only these patterns of version matches for me

@potiuk

Copy link
Copy Markdown
Member

Ah. right - we assume we always have number :)

@potiuk

Copy link
Copy Markdown
Member

UPDATED

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you explain to me what's happening in this code part? If GITHUB_USERNAME is not specified then will it take apache as its value?

echo"${token}"| docker_v login \
--username "${GITHUB_USERNAME:-apache}" \
--password-stdin \
"ghcr.io"||true

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice :)

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small nit. :). If you work on tests - feel fre to add them but I am pretty much ready to merge it.

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small nit. :). If you work on tests - feel fre to add them but I am pretty much ready to merge it.

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you explain to me how this side effect is put to use?

check_cache_and_write_mock.side_effect=lambdacache_key, default_value: (
cache_keyincached_values,
cached_values[cache_key] ifcache_keyincached_valueselsedefault_value,
)
read_from_cache_mock.side_effect=lambdaparam_name: cached_values.get(param_name)
build_parameters=get_image_build_params(parameters)

I could understand that you are mocking the return of those functions but I couldn't understand how it's further used in the code. If possible could you tell me or direct me to some relevant place to learn about it

@potiuk

Copy link
Copy Markdown
Member

I could understand that you are mocking the return of those functions but I couldn't understand how it's further used in the code. If possible could you tell me or direct me to some relevant place to learn about it

Sure - this is the key - lambda (in this case) is really an anonymous function:

This

 read_from_cache_mock.side_effect = lambda param_name: cached_values.get(param_name) 

Is equivalent of this (just written in a shorter way):

 def read_from_cache_mocked_function(param_name):
return cached_values.get(param_name) read_from_cache_mock.side_effect = read_from_cache_mocked_function

The "side-effect" really points to the function that will be called when the "read_from_cache_mock" funciton will be actually called. This allows to implement some logic in your test "mocks" - they become a bit smarter this way. Usually (in simple cases) your mocks can be told to return specific value:

read_from_cache_mock.return_value = x

Also you can tell it to return different values if called multiple times by assigning an iterable to return value:

read_from_cache_mock.return_value = [return_when_called_first_time, return_when_called_second_time, return_when_called_third_time]

And side_effect is the "smartest" way - you just provide your own (usually very simple) implementation of a function that can return different return values - for example based on the parameters that are passed.

In the case above, The "read_from_cache_mock" and "check_cache_and_write_mock" values are really very simple implementation tha cache the values in memory and replace the more "file-based" cache.

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

I see @potiuk thank you. I could better understand the code.

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 3 times, most recently from 9dc4c5e to c2e6b76CompareMarch 23, 2022 10:52
@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk I have tried to add test for prod image similar to what you have done for CI image. Do you think I can further improve with more tests into prod image? Could you give me suggestion on this?

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you share your review about this PR? I made relevant changes wrt recent Dockerfile optimisation

@potiuk

Copy link
Copy Markdown
Member

Rebasing to re-run all tests :)

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Fixing the Breeze2 tests failure

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 3 times, most recently from ef5f97f to d4b7743CompareMarch 29, 2022 04:02
@potiuk
potiuk merged commit 4eebabb into apache:mainMar 29, 2022
@potiuk

Copy link
Copy Markdown
Member

Wooho! 🎉

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:dev-toolsokay to mergeIt's ok to merge this PR as it does not require more tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Breeze: Build PROD image with Breeze

2 participants

@Bowrna@potiuk
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

prod image build changes - #21956

Merged
potiuk merged 1 commit into
apache:mainfrom
Bowrna:build-prod-image
Mar 29, 2022
Merged

prod image build changes#21956
potiuk merged 1 commit into
apache:mainfrom
Bowrna:build-prod-image

Conversation

@Bowrna

Copy link
Copy Markdown
Contributor

closes : #21100
related : #21100

This helps to build prod image using Breeze2


^ Add meaningful description above

Read the Pull Request Guidelines for more information.
In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 8 times, most recently from c203235 to 02c063aCompareMarch 8, 2022 08:05
@potiuk

Copy link
Copy Markdown
Member

Looks cool :)

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 12 times, most recently from 841ddf4 to 714b80cCompareMarch 13, 2022 13:36
@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk

if [[ !${INSTALL_AIRFLOW_VERSION}=~ ^[0-9\.]+((a|b|rc|alpha|beta|pre)[0-9]+)?$ ]];then

Can you give me a few example airflow version that matches this pattern?

@potiuk

potiuk commented Mar 14, 2022

Copy link
Copy Markdown
Member

Can you give me a few example airflow version that matches this pattern?

  • 2.0.1alpha1
  • 2.2.2a10
  • 2.3.0rc1
  • 2.2.0.rc3
  • 2.2.3pre0

@Bowrna

Copy link
Copy Markdown
ContributorAuthor
  • 2.2.3pre

@potiuk

  • 2.0.1alpha1
  • 2.3.0rc1
    Only these patterns of version matches for me

@potiuk

Copy link
Copy Markdown
Member

Ah. right - we assume we always have number :)

@potiuk

Copy link
Copy Markdown
Member

UPDATED

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you explain to me what's happening in this code part? If GITHUB_USERNAME is not specified then will it take apache as its value?

echo"${token}"| docker_v login \
--username "${GITHUB_USERNAME:-apache}" \
--password-stdin \
"ghcr.io"||true

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice :)

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small nit. :). If you work on tests - feel fre to add them but I am pretty much ready to merge it.

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small nit. :). If you work on tests - feel fre to add them but I am pretty much ready to merge it.

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you explain to me how this side effect is put to use?

check_cache_and_write_mock.side_effect=lambdacache_key, default_value: (
cache_keyincached_values,
cached_values[cache_key] ifcache_keyincached_valueselsedefault_value,
)
read_from_cache_mock.side_effect=lambdaparam_name: cached_values.get(param_name)
build_parameters=get_image_build_params(parameters)

I could understand that you are mocking the return of those functions but I couldn't understand how it's further used in the code. If possible could you tell me or direct me to some relevant place to learn about it

@potiuk

Copy link
Copy Markdown
Member

I could understand that you are mocking the return of those functions but I couldn't understand how it's further used in the code. If possible could you tell me or direct me to some relevant place to learn about it

Sure - this is the key - lambda (in this case) is really an anonymous function:

This

 read_from_cache_mock.side_effect = lambda param_name: cached_values.get(param_name) 

Is equivalent of this (just written in a shorter way):

 def read_from_cache_mocked_function(param_name):
return cached_values.get(param_name) read_from_cache_mock.side_effect = read_from_cache_mocked_function

The "side-effect" really points to the function that will be called when the "read_from_cache_mock" funciton will be actually called. This allows to implement some logic in your test "mocks" - they become a bit smarter this way. Usually (in simple cases) your mocks can be told to return specific value:

read_from_cache_mock.return_value = x

Also you can tell it to return different values if called multiple times by assigning an iterable to return value:

read_from_cache_mock.return_value = [return_when_called_first_time, return_when_called_second_time, return_when_called_third_time]

And side_effect is the "smartest" way - you just provide your own (usually very simple) implementation of a function that can return different return values - for example based on the parameters that are passed.

In the case above, The "read_from_cache_mock" and "check_cache_and_write_mock" values are really very simple implementation tha cache the values in memory and replace the more "file-based" cache.

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

I see @potiuk thank you. I could better understand the code.

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 3 times, most recently from 9dc4c5e to c2e6b76CompareMarch 23, 2022 10:52
@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk I have tried to add test for prod image similar to what you have done for CI image. Do you think I can further improve with more tests into prod image? Could you give me suggestion on this?

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you share your review about this PR? I made relevant changes wrt recent Dockerfile optimisation

@potiuk

Copy link
Copy Markdown
Member

Rebasing to re-run all tests :)

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Fixing the Breeze2 tests failure

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 3 times, most recently from ef5f97f to d4b7743CompareMarch 29, 2022 04:02
@potiuk
potiuk merged commit 4eebabb into apache:mainMar 29, 2022
@potiuk

Copy link
Copy Markdown
Member

Wooho! 🎉

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:dev-toolsokay to mergeIt's ok to merge this PR as it does not require more tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Breeze: Build PROD image with Breeze

2 participants

@Bowrna@potiuk
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

prod image build changes - #21956

Merged
potiuk merged 1 commit into
apache:mainfrom
Bowrna:build-prod-image
Mar 29, 2022
Merged

prod image build changes#21956
potiuk merged 1 commit into
apache:mainfrom
Bowrna:build-prod-image

Conversation

@Bowrna

Copy link
Copy Markdown
Contributor

closes : #21100
related : #21100

This helps to build prod image using Breeze2


^ Add meaningful description above

Read the Pull Request Guidelines for more information.
In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 8 times, most recently from c203235 to 02c063aCompareMarch 8, 2022 08:05
@potiuk

Copy link
Copy Markdown
Member

Looks cool :)

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 12 times, most recently from 841ddf4 to 714b80cCompareMarch 13, 2022 13:36
@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk

if [[ !${INSTALL_AIRFLOW_VERSION}=~ ^[0-9\.]+((a|b|rc|alpha|beta|pre)[0-9]+)?$ ]];then

Can you give me a few example airflow version that matches this pattern?

@potiuk

potiuk commented Mar 14, 2022

Copy link
Copy Markdown
Member

Can you give me a few example airflow version that matches this pattern?

  • 2.0.1alpha1
  • 2.2.2a10
  • 2.3.0rc1
  • 2.2.0.rc3
  • 2.2.3pre0

@Bowrna

Copy link
Copy Markdown
ContributorAuthor
  • 2.2.3pre

@potiuk

  • 2.0.1alpha1
  • 2.3.0rc1
    Only these patterns of version matches for me

@potiuk

Copy link
Copy Markdown
Member

Ah. right - we assume we always have number :)

@potiuk

Copy link
Copy Markdown
Member

UPDATED

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you explain to me what's happening in this code part? If GITHUB_USERNAME is not specified then will it take apache as its value?

echo"${token}"| docker_v login \
--username "${GITHUB_USERNAME:-apache}" \
--password-stdin \
"ghcr.io"||true

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice :)

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small nit. :). If you work on tests - feel fre to add them but I am pretty much ready to merge it.

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small nit. :). If you work on tests - feel fre to add them but I am pretty much ready to merge it.

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you explain to me how this side effect is put to use?

check_cache_and_write_mock.side_effect=lambdacache_key, default_value: (
cache_keyincached_values,
cached_values[cache_key] ifcache_keyincached_valueselsedefault_value,
)
read_from_cache_mock.side_effect=lambdaparam_name: cached_values.get(param_name)
build_parameters=get_image_build_params(parameters)

I could understand that you are mocking the return of those functions but I couldn't understand how it's further used in the code. If possible could you tell me or direct me to some relevant place to learn about it

@potiuk

Copy link
Copy Markdown
Member

I could understand that you are mocking the return of those functions but I couldn't understand how it's further used in the code. If possible could you tell me or direct me to some relevant place to learn about it

Sure - this is the key - lambda (in this case) is really an anonymous function:

This

 read_from_cache_mock.side_effect = lambda param_name: cached_values.get(param_name) 

Is equivalent of this (just written in a shorter way):

 def read_from_cache_mocked_function(param_name):
return cached_values.get(param_name) read_from_cache_mock.side_effect = read_from_cache_mocked_function

The "side-effect" really points to the function that will be called when the "read_from_cache_mock" funciton will be actually called. This allows to implement some logic in your test "mocks" - they become a bit smarter this way. Usually (in simple cases) your mocks can be told to return specific value:

read_from_cache_mock.return_value = x

Also you can tell it to return different values if called multiple times by assigning an iterable to return value:

read_from_cache_mock.return_value = [return_when_called_first_time, return_when_called_second_time, return_when_called_third_time]

And side_effect is the "smartest" way - you just provide your own (usually very simple) implementation of a function that can return different return values - for example based on the parameters that are passed.

In the case above, The "read_from_cache_mock" and "check_cache_and_write_mock" values are really very simple implementation tha cache the values in memory and replace the more "file-based" cache.

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

I see @potiuk thank you. I could better understand the code.

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 3 times, most recently from 9dc4c5e to c2e6b76CompareMarch 23, 2022 10:52
@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk I have tried to add test for prod image similar to what you have done for CI image. Do you think I can further improve with more tests into prod image? Could you give me suggestion on this?

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you share your review about this PR? I made relevant changes wrt recent Dockerfile optimisation

@potiuk

Copy link
Copy Markdown
Member

Rebasing to re-run all tests :)

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Fixing the Breeze2 tests failure

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 3 times, most recently from ef5f97f to d4b7743CompareMarch 29, 2022 04:02
@potiuk
potiuk merged commit 4eebabb into apache:mainMar 29, 2022
@potiuk

Copy link
Copy Markdown
Member

Wooho! 🎉

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:dev-toolsokay to mergeIt's ok to merge this PR as it does not require more tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Breeze: Build PROD image with Breeze

2 participants

@Bowrna@potiuk
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

prod image build changes - #21956

Merged
potiuk merged 1 commit into
apache:mainfrom
Bowrna:build-prod-image
Mar 29, 2022
Merged

prod image build changes#21956
potiuk merged 1 commit into
apache:mainfrom
Bowrna:build-prod-image

Conversation

@Bowrna

Copy link
Copy Markdown
Contributor

closes : #21100
related : #21100

This helps to build prod image using Breeze2


^ Add meaningful description above

Read the Pull Request Guidelines for more information.
In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 8 times, most recently from c203235 to 02c063aCompareMarch 8, 2022 08:05
@potiuk

Copy link
Copy Markdown
Member

Looks cool :)

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 12 times, most recently from 841ddf4 to 714b80cCompareMarch 13, 2022 13:36
@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk

if [[ !${INSTALL_AIRFLOW_VERSION}=~ ^[0-9\.]+((a|b|rc|alpha|beta|pre)[0-9]+)?$ ]];then

Can you give me a few example airflow version that matches this pattern?

@potiuk

potiuk commented Mar 14, 2022

Copy link
Copy Markdown
Member

Can you give me a few example airflow version that matches this pattern?

  • 2.0.1alpha1
  • 2.2.2a10
  • 2.3.0rc1
  • 2.2.0.rc3
  • 2.2.3pre0

@Bowrna

Copy link
Copy Markdown
ContributorAuthor
  • 2.2.3pre

@potiuk

  • 2.0.1alpha1
  • 2.3.0rc1
    Only these patterns of version matches for me

@potiuk

Copy link
Copy Markdown
Member

Ah. right - we assume we always have number :)

@potiuk

Copy link
Copy Markdown
Member

UPDATED

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you explain to me what's happening in this code part? If GITHUB_USERNAME is not specified then will it take apache as its value?

echo"${token}"| docker_v login \
--username "${GITHUB_USERNAME:-apache}" \
--password-stdin \
"ghcr.io"||true

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice :)

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small nit. :). If you work on tests - feel fre to add them but I am pretty much ready to merge it.

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small nit. :). If you work on tests - feel fre to add them but I am pretty much ready to merge it.

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you explain to me how this side effect is put to use?

check_cache_and_write_mock.side_effect=lambdacache_key, default_value: (
cache_keyincached_values,
cached_values[cache_key] ifcache_keyincached_valueselsedefault_value,
)
read_from_cache_mock.side_effect=lambdaparam_name: cached_values.get(param_name)
build_parameters=get_image_build_params(parameters)

I could understand that you are mocking the return of those functions but I couldn't understand how it's further used in the code. If possible could you tell me or direct me to some relevant place to learn about it

@potiuk

Copy link
Copy Markdown
Member

I could understand that you are mocking the return of those functions but I couldn't understand how it's further used in the code. If possible could you tell me or direct me to some relevant place to learn about it

Sure - this is the key - lambda (in this case) is really an anonymous function:

This

 read_from_cache_mock.side_effect = lambda param_name: cached_values.get(param_name) 

Is equivalent of this (just written in a shorter way):

 def read_from_cache_mocked_function(param_name):
return cached_values.get(param_name) read_from_cache_mock.side_effect = read_from_cache_mocked_function

The "side-effect" really points to the function that will be called when the "read_from_cache_mock" funciton will be actually called. This allows to implement some logic in your test "mocks" - they become a bit smarter this way. Usually (in simple cases) your mocks can be told to return specific value:

read_from_cache_mock.return_value = x

Also you can tell it to return different values if called multiple times by assigning an iterable to return value:

read_from_cache_mock.return_value = [return_when_called_first_time, return_when_called_second_time, return_when_called_third_time]

And side_effect is the "smartest" way - you just provide your own (usually very simple) implementation of a function that can return different return values - for example based on the parameters that are passed.

In the case above, The "read_from_cache_mock" and "check_cache_and_write_mock" values are really very simple implementation tha cache the values in memory and replace the more "file-based" cache.

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

I see @potiuk thank you. I could better understand the code.

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 3 times, most recently from 9dc4c5e to c2e6b76CompareMarch 23, 2022 10:52
@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk I have tried to add test for prod image similar to what you have done for CI image. Do you think I can further improve with more tests into prod image? Could you give me suggestion on this?

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you share your review about this PR? I made relevant changes wrt recent Dockerfile optimisation

@potiuk

Copy link
Copy Markdown
Member

Rebasing to re-run all tests :)

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Fixing the Breeze2 tests failure

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 3 times, most recently from ef5f97f to d4b7743CompareMarch 29, 2022 04:02
@potiuk
potiuk merged commit 4eebabb into apache:mainMar 29, 2022
@potiuk

Copy link
Copy Markdown
Member

Wooho! 🎉

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:dev-toolsokay to mergeIt's ok to merge this PR as it does not require more tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Breeze: Build PROD image with Breeze

2 participants

@Bowrna@potiuk
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

prod image build changes - #21956

Merged
potiuk merged 1 commit into
apache:mainfrom
Bowrna:build-prod-image
Mar 29, 2022
Merged

prod image build changes#21956
potiuk merged 1 commit into
apache:mainfrom
Bowrna:build-prod-image

Conversation

@Bowrna

Copy link
Copy Markdown
Contributor

closes : #21100
related : #21100

This helps to build prod image using Breeze2


^ Add meaningful description above

Read the Pull Request Guidelines for more information.
In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 8 times, most recently from c203235 to 02c063aCompareMarch 8, 2022 08:05
@potiuk

Copy link
Copy Markdown
Member

Looks cool :)

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 12 times, most recently from 841ddf4 to 714b80cCompareMarch 13, 2022 13:36
@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk

if [[ !${INSTALL_AIRFLOW_VERSION}=~ ^[0-9\.]+((a|b|rc|alpha|beta|pre)[0-9]+)?$ ]];then

Can you give me a few example airflow version that matches this pattern?

@potiuk

potiuk commented Mar 14, 2022

Copy link
Copy Markdown
Member

Can you give me a few example airflow version that matches this pattern?

  • 2.0.1alpha1
  • 2.2.2a10
  • 2.3.0rc1
  • 2.2.0.rc3
  • 2.2.3pre0

@Bowrna

Copy link
Copy Markdown
ContributorAuthor
  • 2.2.3pre

@potiuk

  • 2.0.1alpha1
  • 2.3.0rc1
    Only these patterns of version matches for me

@potiuk

Copy link
Copy Markdown
Member

Ah. right - we assume we always have number :)

@potiuk

Copy link
Copy Markdown
Member

UPDATED

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you explain to me what's happening in this code part? If GITHUB_USERNAME is not specified then will it take apache as its value?

echo"${token}"| docker_v login \
--username "${GITHUB_USERNAME:-apache}" \
--password-stdin \
"ghcr.io"||true

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice :)

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small nit. :). If you work on tests - feel fre to add them but I am pretty much ready to merge it.

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small nit. :). If you work on tests - feel fre to add them but I am pretty much ready to merge it.

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you explain to me how this side effect is put to use?

check_cache_and_write_mock.side_effect=lambdacache_key, default_value: (
cache_keyincached_values,
cached_values[cache_key] ifcache_keyincached_valueselsedefault_value,
)
read_from_cache_mock.side_effect=lambdaparam_name: cached_values.get(param_name)
build_parameters=get_image_build_params(parameters)

I could understand that you are mocking the return of those functions but I couldn't understand how it's further used in the code. If possible could you tell me or direct me to some relevant place to learn about it

@potiuk

Copy link
Copy Markdown
Member

I could understand that you are mocking the return of those functions but I couldn't understand how it's further used in the code. If possible could you tell me or direct me to some relevant place to learn about it

Sure - this is the key - lambda (in this case) is really an anonymous function:

This

 read_from_cache_mock.side_effect = lambda param_name: cached_values.get(param_name) 

Is equivalent of this (just written in a shorter way):

 def read_from_cache_mocked_function(param_name):
return cached_values.get(param_name) read_from_cache_mock.side_effect = read_from_cache_mocked_function

The "side-effect" really points to the function that will be called when the "read_from_cache_mock" funciton will be actually called. This allows to implement some logic in your test "mocks" - they become a bit smarter this way. Usually (in simple cases) your mocks can be told to return specific value:

read_from_cache_mock.return_value = x

Also you can tell it to return different values if called multiple times by assigning an iterable to return value:

read_from_cache_mock.return_value = [return_when_called_first_time, return_when_called_second_time, return_when_called_third_time]

And side_effect is the "smartest" way - you just provide your own (usually very simple) implementation of a function that can return different return values - for example based on the parameters that are passed.

In the case above, The "read_from_cache_mock" and "check_cache_and_write_mock" values are really very simple implementation tha cache the values in memory and replace the more "file-based" cache.

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

I see @potiuk thank you. I could better understand the code.

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 3 times, most recently from 9dc4c5e to c2e6b76CompareMarch 23, 2022 10:52
@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk I have tried to add test for prod image similar to what you have done for CI image. Do you think I can further improve with more tests into prod image? Could you give me suggestion on this?

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you share your review about this PR? I made relevant changes wrt recent Dockerfile optimisation

@potiuk

Copy link
Copy Markdown
Member

Rebasing to re-run all tests :)

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Fixing the Breeze2 tests failure

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 3 times, most recently from ef5f97f to d4b7743CompareMarch 29, 2022 04:02
@potiuk
potiuk merged commit 4eebabb into apache:mainMar 29, 2022
@potiuk

Copy link
Copy Markdown
Member

Wooho! 🎉

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:dev-toolsokay to mergeIt's ok to merge this PR as it does not require more tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Breeze: Build PROD image with Breeze

2 participants

@Bowrna@potiuk
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

prod image build changes - #21956

Merged
potiuk merged 1 commit into
apache:mainfrom
Bowrna:build-prod-image
Mar 29, 2022
Merged

prod image build changes#21956
potiuk merged 1 commit into
apache:mainfrom
Bowrna:build-prod-image

Conversation

@Bowrna

Copy link
Copy Markdown
Contributor

closes : #21100
related : #21100

This helps to build prod image using Breeze2


^ Add meaningful description above

Read the Pull Request Guidelines for more information.
In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 8 times, most recently from c203235 to 02c063aCompareMarch 8, 2022 08:05
@potiuk

Copy link
Copy Markdown
Member

Looks cool :)

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 12 times, most recently from 841ddf4 to 714b80cCompareMarch 13, 2022 13:36
@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk

if [[ !${INSTALL_AIRFLOW_VERSION}=~ ^[0-9\.]+((a|b|rc|alpha|beta|pre)[0-9]+)?$ ]];then

Can you give me a few example airflow version that matches this pattern?

@potiuk

potiuk commented Mar 14, 2022

Copy link
Copy Markdown
Member

Can you give me a few example airflow version that matches this pattern?

  • 2.0.1alpha1
  • 2.2.2a10
  • 2.3.0rc1
  • 2.2.0.rc3
  • 2.2.3pre0

@Bowrna

Copy link
Copy Markdown
ContributorAuthor
  • 2.2.3pre

@potiuk

  • 2.0.1alpha1
  • 2.3.0rc1
    Only these patterns of version matches for me

@potiuk

Copy link
Copy Markdown
Member

Ah. right - we assume we always have number :)

@potiuk

Copy link
Copy Markdown
Member

UPDATED

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you explain to me what's happening in this code part? If GITHUB_USERNAME is not specified then will it take apache as its value?

echo"${token}"| docker_v login \
--username "${GITHUB_USERNAME:-apache}" \
--password-stdin \
"ghcr.io"||true

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice :)

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small nit. :). If you work on tests - feel fre to add them but I am pretty much ready to merge it.

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small nit. :). If you work on tests - feel fre to add them but I am pretty much ready to merge it.

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you explain to me how this side effect is put to use?

check_cache_and_write_mock.side_effect=lambdacache_key, default_value: (
cache_keyincached_values,
cached_values[cache_key] ifcache_keyincached_valueselsedefault_value,
)
read_from_cache_mock.side_effect=lambdaparam_name: cached_values.get(param_name)
build_parameters=get_image_build_params(parameters)

I could understand that you are mocking the return of those functions but I couldn't understand how it's further used in the code. If possible could you tell me or direct me to some relevant place to learn about it

@potiuk

Copy link
Copy Markdown
Member

I could understand that you are mocking the return of those functions but I couldn't understand how it's further used in the code. If possible could you tell me or direct me to some relevant place to learn about it

Sure - this is the key - lambda (in this case) is really an anonymous function:

This

 read_from_cache_mock.side_effect = lambda param_name: cached_values.get(param_name) 

Is equivalent of this (just written in a shorter way):

 def read_from_cache_mocked_function(param_name):
return cached_values.get(param_name) read_from_cache_mock.side_effect = read_from_cache_mocked_function

The "side-effect" really points to the function that will be called when the "read_from_cache_mock" funciton will be actually called. This allows to implement some logic in your test "mocks" - they become a bit smarter this way. Usually (in simple cases) your mocks can be told to return specific value:

read_from_cache_mock.return_value = x

Also you can tell it to return different values if called multiple times by assigning an iterable to return value:

read_from_cache_mock.return_value = [return_when_called_first_time, return_when_called_second_time, return_when_called_third_time]

And side_effect is the "smartest" way - you just provide your own (usually very simple) implementation of a function that can return different return values - for example based on the parameters that are passed.

In the case above, The "read_from_cache_mock" and "check_cache_and_write_mock" values are really very simple implementation tha cache the values in memory and replace the more "file-based" cache.

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

I see @potiuk thank you. I could better understand the code.

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 3 times, most recently from 9dc4c5e to c2e6b76CompareMarch 23, 2022 10:52
@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk I have tried to add test for prod image similar to what you have done for CI image. Do you think I can further improve with more tests into prod image? Could you give me suggestion on this?

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you share your review about this PR? I made relevant changes wrt recent Dockerfile optimisation

@potiuk

Copy link
Copy Markdown
Member

Rebasing to re-run all tests :)

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Fixing the Breeze2 tests failure

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 3 times, most recently from ef5f97f to d4b7743CompareMarch 29, 2022 04:02
@potiuk
potiuk merged commit 4eebabb into apache:mainMar 29, 2022
@potiuk

Copy link
Copy Markdown
Member

Wooho! 🎉

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:dev-toolsokay to mergeIt's ok to merge this PR as it does not require more tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Breeze: Build PROD image with Breeze

2 participants

@Bowrna@potiuk
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

prod image build changes - #21956

Merged
potiuk merged 1 commit into
apache:mainfrom
Bowrna:build-prod-image
Mar 29, 2022
Merged

prod image build changes#21956
potiuk merged 1 commit into
apache:mainfrom
Bowrna:build-prod-image

Conversation

@Bowrna

Copy link
Copy Markdown
Contributor

closes : #21100
related : #21100

This helps to build prod image using Breeze2


^ Add meaningful description above

Read the Pull Request Guidelines for more information.
In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 8 times, most recently from c203235 to 02c063aCompareMarch 8, 2022 08:05
@potiuk

Copy link
Copy Markdown
Member

Looks cool :)

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 12 times, most recently from 841ddf4 to 714b80cCompareMarch 13, 2022 13:36
@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk

if [[ !${INSTALL_AIRFLOW_VERSION}=~ ^[0-9\.]+((a|b|rc|alpha|beta|pre)[0-9]+)?$ ]];then

Can you give me a few example airflow version that matches this pattern?

@potiuk

potiuk commented Mar 14, 2022

Copy link
Copy Markdown
Member

Can you give me a few example airflow version that matches this pattern?

  • 2.0.1alpha1
  • 2.2.2a10
  • 2.3.0rc1
  • 2.2.0.rc3
  • 2.2.3pre0

@Bowrna

Copy link
Copy Markdown
ContributorAuthor
  • 2.2.3pre

@potiuk

  • 2.0.1alpha1
  • 2.3.0rc1
    Only these patterns of version matches for me

@potiuk

Copy link
Copy Markdown
Member

Ah. right - we assume we always have number :)

@potiuk

Copy link
Copy Markdown
Member

UPDATED

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you explain to me what's happening in this code part? If GITHUB_USERNAME is not specified then will it take apache as its value?

echo"${token}"| docker_v login \
--username "${GITHUB_USERNAME:-apache}" \
--password-stdin \
"ghcr.io"||true

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice :)

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small nit. :). If you work on tests - feel fre to add them but I am pretty much ready to merge it.

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small nit. :). If you work on tests - feel fre to add them but I am pretty much ready to merge it.

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you explain to me how this side effect is put to use?

check_cache_and_write_mock.side_effect=lambdacache_key, default_value: (
cache_keyincached_values,
cached_values[cache_key] ifcache_keyincached_valueselsedefault_value,
)
read_from_cache_mock.side_effect=lambdaparam_name: cached_values.get(param_name)
build_parameters=get_image_build_params(parameters)

I could understand that you are mocking the return of those functions but I couldn't understand how it's further used in the code. If possible could you tell me or direct me to some relevant place to learn about it

@potiuk

Copy link
Copy Markdown
Member

I could understand that you are mocking the return of those functions but I couldn't understand how it's further used in the code. If possible could you tell me or direct me to some relevant place to learn about it

Sure - this is the key - lambda (in this case) is really an anonymous function:

This

 read_from_cache_mock.side_effect = lambda param_name: cached_values.get(param_name) 

Is equivalent of this (just written in a shorter way):

 def read_from_cache_mocked_function(param_name):
return cached_values.get(param_name) read_from_cache_mock.side_effect = read_from_cache_mocked_function

The "side-effect" really points to the function that will be called when the "read_from_cache_mock" funciton will be actually called. This allows to implement some logic in your test "mocks" - they become a bit smarter this way. Usually (in simple cases) your mocks can be told to return specific value:

read_from_cache_mock.return_value = x

Also you can tell it to return different values if called multiple times by assigning an iterable to return value:

read_from_cache_mock.return_value = [return_when_called_first_time, return_when_called_second_time, return_when_called_third_time]

And side_effect is the "smartest" way - you just provide your own (usually very simple) implementation of a function that can return different return values - for example based on the parameters that are passed.

In the case above, The "read_from_cache_mock" and "check_cache_and_write_mock" values are really very simple implementation tha cache the values in memory and replace the more "file-based" cache.

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

I see @potiuk thank you. I could better understand the code.

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 3 times, most recently from 9dc4c5e to c2e6b76CompareMarch 23, 2022 10:52
@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk I have tried to add test for prod image similar to what you have done for CI image. Do you think I can further improve with more tests into prod image? Could you give me suggestion on this?

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you share your review about this PR? I made relevant changes wrt recent Dockerfile optimisation

@potiuk

Copy link
Copy Markdown
Member

Rebasing to re-run all tests :)

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Fixing the Breeze2 tests failure

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 3 times, most recently from ef5f97f to d4b7743CompareMarch 29, 2022 04:02
@potiuk
potiuk merged commit 4eebabb into apache:mainMar 29, 2022
@potiuk

Copy link
Copy Markdown
Member

Wooho! 🎉

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:dev-toolsokay to mergeIt's ok to merge this PR as it does not require more tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Breeze: Build PROD image with Breeze

2 participants

@Bowrna@potiuk
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

prod image build changes - #21956

Merged
potiuk merged 1 commit into
apache:mainfrom
Bowrna:build-prod-image
Mar 29, 2022
Merged

prod image build changes#21956
potiuk merged 1 commit into
apache:mainfrom
Bowrna:build-prod-image

Conversation

@Bowrna

Copy link
Copy Markdown
Contributor

closes : #21100
related : #21100

This helps to build prod image using Breeze2


^ Add meaningful description above

Read the Pull Request Guidelines for more information.
In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 8 times, most recently from c203235 to 02c063aCompareMarch 8, 2022 08:05
@potiuk

Copy link
Copy Markdown
Member

Looks cool :)

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 12 times, most recently from 841ddf4 to 714b80cCompareMarch 13, 2022 13:36
@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk

if [[ !${INSTALL_AIRFLOW_VERSION}=~ ^[0-9\.]+((a|b|rc|alpha|beta|pre)[0-9]+)?$ ]];then

Can you give me a few example airflow version that matches this pattern?

@potiuk

potiuk commented Mar 14, 2022

Copy link
Copy Markdown
Member

Can you give me a few example airflow version that matches this pattern?

  • 2.0.1alpha1
  • 2.2.2a10
  • 2.3.0rc1
  • 2.2.0.rc3
  • 2.2.3pre0

@Bowrna

Copy link
Copy Markdown
ContributorAuthor
  • 2.2.3pre

@potiuk

  • 2.0.1alpha1
  • 2.3.0rc1
    Only these patterns of version matches for me

@potiuk

Copy link
Copy Markdown
Member

Ah. right - we assume we always have number :)

@potiuk

Copy link
Copy Markdown
Member

UPDATED

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you explain to me what's happening in this code part? If GITHUB_USERNAME is not specified then will it take apache as its value?

echo"${token}"| docker_v login \
--username "${GITHUB_USERNAME:-apache}" \
--password-stdin \
"ghcr.io"||true

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice :)

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small nit. :). If you work on tests - feel fre to add them but I am pretty much ready to merge it.

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small nit. :). If you work on tests - feel fre to add them but I am pretty much ready to merge it.

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you explain to me how this side effect is put to use?

check_cache_and_write_mock.side_effect=lambdacache_key, default_value: (
cache_keyincached_values,
cached_values[cache_key] ifcache_keyincached_valueselsedefault_value,
)
read_from_cache_mock.side_effect=lambdaparam_name: cached_values.get(param_name)
build_parameters=get_image_build_params(parameters)

I could understand that you are mocking the return of those functions but I couldn't understand how it's further used in the code. If possible could you tell me or direct me to some relevant place to learn about it

@potiuk

Copy link
Copy Markdown
Member

I could understand that you are mocking the return of those functions but I couldn't understand how it's further used in the code. If possible could you tell me or direct me to some relevant place to learn about it

Sure - this is the key - lambda (in this case) is really an anonymous function:

This

 read_from_cache_mock.side_effect = lambda param_name: cached_values.get(param_name) 

Is equivalent of this (just written in a shorter way):

 def read_from_cache_mocked_function(param_name):
return cached_values.get(param_name) read_from_cache_mock.side_effect = read_from_cache_mocked_function

The "side-effect" really points to the function that will be called when the "read_from_cache_mock" funciton will be actually called. This allows to implement some logic in your test "mocks" - they become a bit smarter this way. Usually (in simple cases) your mocks can be told to return specific value:

read_from_cache_mock.return_value = x

Also you can tell it to return different values if called multiple times by assigning an iterable to return value:

read_from_cache_mock.return_value = [return_when_called_first_time, return_when_called_second_time, return_when_called_third_time]

And side_effect is the "smartest" way - you just provide your own (usually very simple) implementation of a function that can return different return values - for example based on the parameters that are passed.

In the case above, The "read_from_cache_mock" and "check_cache_and_write_mock" values are really very simple implementation tha cache the values in memory and replace the more "file-based" cache.

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

I see @potiuk thank you. I could better understand the code.

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 3 times, most recently from 9dc4c5e to c2e6b76CompareMarch 23, 2022 10:52
@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk I have tried to add test for prod image similar to what you have done for CI image. Do you think I can further improve with more tests into prod image? Could you give me suggestion on this?

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Could you share your review about this PR? I made relevant changes wrt recent Dockerfile optimisation

@potiuk

Copy link
Copy Markdown
Member

Rebasing to re-run all tests :)

@Bowrna

Copy link
Copy Markdown
ContributorAuthor

@potiuk Fixing the Breeze2 tests failure

@Bowrna
Bowrnaforce-pushed the build-prod-image branch 3 times, most recently from ef5f97f to d4b7743CompareMarch 29, 2022 04:02
@potiuk
potiuk merged commit 4eebabb into apache:mainMar 29, 2022
@potiuk

Copy link
Copy Markdown
Member

Wooho! 🎉

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:dev-toolsokay to mergeIt's ok to merge this PR as it does not require more tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Breeze: Build PROD image with Breeze

2 participants

@Bowrna@potiuk