') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); prepare PR 2 by devslovecoffee · Pull Request #2 · CallstackAI/grafbase · GitHub
Skip to content

prepare PR 2 - #2

Open
devslovecoffee wants to merge 1 commit into
pr-1from
pr-2
Open

prepare PR 2#2
devslovecoffee wants to merge 1 commit into
pr-1from
pr-2

Conversation

@devslovecoffee

@devslovecoffeedevslovecoffee commented Aug 1, 2024

Copy link
Copy Markdown
Collaborator

Description by Cal

PR Description

This PR updates various dependencies in the project, including version upgrades for rustls, clap, bstr, and others. It also introduces a new EntityCacheStorage enum and modifies the EntityCachingConfig structure to include a storage option.

Key Issues

None

Files Changed

File: /Cargo.lock Updated multiple dependencies to their latest versions.
File: /engine/crates/engine-config-builder/src/from_sdl_config.rs Modified pattern matching to include additional fields in `EntityCachingConfig`.
File: /engine/crates/engine-v2/src/operation/metrics.rs Added a new field `used_fields` to the metrics attributes.
File: /engine/crates/engine/response/src/lib.rs Updated the `GraphqlOperationAnalyticsAttributes` struct to include `used_fields`.
File: /engine/crates/engine/src/schema.rs Modified the handling of operation analytics attributes to include `used_fields`.
File: /engine/crates/gateway-core/src/cache/partial.rs Updated the response creation to include `used_fields`.
File: /engine/crates/parser-sdl/src/federation.rs Introduced a new enum `EntityCacheStorage` and updated `EntityCachingConfig`.
File: /engine/crates/runtime-local/src/lib.rs Added Redis module for rate limiting.
File: /engine/crates/runtime-local/src/rate_limiting/redis.rs Implemented Redis rate limiting functionality.
File: /gateway/crates/config/src/entity_caching.rs Updated `EntityCachingConfig` to include Redis configuration options.
# Description

Please include a summary of the change and which issue is fixed.
Please also include relevant motivation and context.

Type of change

  • 💔 Breaking
  • 🚀 Feature
  • 🐛 Fix
  • 🛠️ Tooling
  • 🔨 Refactoring
  • 🧪 Test
  • 📦 Dependency
  • 📖 Requires documentation update

) -> EntityCacheStorage {
match storage {
gateway_config::EntityCachingStorage::Memory => EntityCacheStorage::Memory,
gateway_config::EntityCachingStorage::Redis => EntityCacheStorage::Redis(redis.unwrap_or_default().into()),

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

🐛 Bug
The function entity_cache_storage does not handle the case where redis is None for the Redis storage variant. This could lead to a panic if redis.unwrap_or_default() is called when redis is None. You should handle this case more gracefully.

Suggested change
gateway_config::EntityCachingStorage::Redis => EntityCacheStorage::Redis(redis.unwrap_or_default().into()),
EntityCacheStorage::Redis(redis.unwrap_or_else(|| gateway_config::EntityCachingRedisConfig::default().into()))

fn new_pool(url: &str, tls_config: Option<RedisTlsConfig<'_>>) -> anyhow::Result<Pool> {
let tls_config = match tls_config {
Some(tls) => {
let client_tls = match tls.cert.zip(tls.key) {

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Suggestion
In the new_pool function, consider handling the case where tls.cert or tls.key is None more explicitly, to avoid potential panics when calling zip on None values.

});

let pool = redis_factory
.pool(config.redis.url, tls)

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Suggestion
Ensure that the error handling for the Redis connection pool creation is robust and provides meaningful feedback.

Comment threadCargo.lock
[[package]]
name = "rustls"
version = "0.23.10"
version = "0.23.12"

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Suggestion
Check if the new version of rustls includes any security patches or important updates that need to be addressed in your application.

Sign up for freeto 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.

1 participant

@devslovecoffee