Skip to content

Commit faeb3ce

Browse files
hadar-cohadar-co
authored
Merge branch 'main' into PORT-n8n-vulnerability
2 parents d56372e + e2ac500 commit faeb3ce

File tree

12 files changed

+129
-22
lines changed

12 files changed

+129
-22
lines changed

‎docs/build-your-software-catalog/sync-data-to-catalog/cloud-providers/aws-v3/resource-and-property-reference/resource-and-property-reference.md‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Each Port-supported resource type comes with a set of actions that align with AW
5555

5656
These mappings ensure that only the properties available from the selected AWS actions are ingested into your Port catalog.
5757

58-
### Enabling and Customizing Actions
58+
### Enabling and customizing actions
5959

6060
With Port, you have full control over which AWS resource properties are discovered and ingested into your catalog by specifying the actions to use for each resource type. Actions define what data you collect and the AWS permissions required.
6161

@@ -70,29 +70,30 @@ To collect additional properties from AWS resources, add the optional actions yo
7070
query: 'true'
7171
includeActions:
7272
- DescribeInstanceStatusAction
73+
```
7374
74-
In this configuration, Port will enrich your catalog by fetching all properties provided by the [DescribeInstanceStatus API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeInstanceStatus.html) for every EC2 instance.
75+
In this case, Port will enrich your catalog by fetching all properties returned by the [DescribeInstanceStatus API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeInstanceStatus.html) for every EC2 instance.
7576
76-
:::caution Action limit
77-
You can include a **maximum of 3 optional actions per resource kind** (excluding default actions). To use more than 3 actions, you can configure multiple resource kinds in your integration.
77+
:::caution Maximum actions per resource
78+
You can include a **maximum of 3 optional actions per resource kind** (default actions excluded). To use more than 3 optional actions, configure multiple resource kinds in your integration.
7879
:::
7980
8081
8182
### Querying resources from specific regions
8283
83-
The `regionPolicy` selector lets you control which AWS regions are queried by the integration. Use it to include or exclude regions per resource.
84+
You can control which AWS regions Port queries for resources using the `regionPolicy` selector. This allows you to include or exclude specific regions per resource type.
8485

8586
- allow: List of regions explicitly permitted for querying
8687
- deny: List of regions explicitly excluded from querying
8788

8889
#### How `regionPolicy` works
8990

90-
1. If both lists are empty: all regions are allowed.
91-
2. If the region is in `deny`: it is excluded unless explicitly allowed.
92-
3. If the region is in `allow`: it is included for querying.
93-
4. If a region appears in both lists: it is excluded.
94-
5. If only `deny` is specified: only regions in the `deny` list are excluded.
95-
6. If only `allow` is specified: only regions in the `allow` list are included.
91+
1. If both lists are empty, all regions are allowed.
92+
2. If a region is listed in `deny`, it is excluded unless explicitly allowed.
93+
3. If a region is listed in `allow`, it is included for querying.
94+
4. If a region is present in both lists, it is excluded.
95+
5. If only `deny` is specified, only the regions in `deny` are excluded.
96+
6. If only `allow` is specified, only the regions in `allow` are included.
9697

9798
#### Example configuration
9899

‎src/components/IntegrationsTable/IntegrationsTable.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const IntegrationCard = ({ integration }) => {
1515
return (
1616
<Link to={integration.docsUrl} className={styles.card}>
1717
<div className={styles.cardHeader}>
18-
<LogoImage logo={integration.name} width='32px' />
18+
<LogoImage logo={integration.name} iconName={integration.iconName} width='32px' />
1919
{/* <img
2020
src={iconPath}
2121
alt={integration.name}

‎src/components/IntegrationsTable/integrations-data.js‎

Lines changed: 78 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@ export const integrations = [
2121
darkIcon: '/img/guides/icons/dark/BitBucket.svg',
2222
docsUrl: '/build-your-software-catalog/sync-data-to-catalog/git/bitbucket/bitbucket-cloud',
2323
},
24+
{
25+
name: 'BitBucket server integration',
26+
category: 'git',
27+
iconName: 'BitBucket',
28+
icon: '/img/guides/icons/BitBucket.svg',
29+
darkIcon: '/img/guides/icons/dark/BitBucket.svg',
30+
docsUrl: '/build-your-software-catalog/sync-data-to-catalog/git/bitbucket/bitbucket-server',
31+
},
2432
{
2533
name: 'AzureDevops',
2634
category: 'git',
@@ -50,10 +58,33 @@ export const integrations = [
5058
darkIcon: '/img/guides/icons/dark/ArgoCD.svg',
5159
docsUrl: '/build-your-software-catalog/sync-data-to-catalog/argocd',
5260
},
61+
{
62+
name: 'Komodor',
63+
category: 'kubernetes',
64+
icon: '/img/guides/icons/Komodor.svg',
65+
darkIcon: '/img/guides/icons/dark/Komodor.svg',
66+
docsUrl: '/build-your-software-catalog/sync-data-to-catalog/kubernetes-stack/komodor',
67+
},
68+
{
69+
name: 'Istio',
70+
category: 'kubernetes',
71+
icon: '/img/guides/icons/Istio.svg',
72+
darkIcon: '/img/guides/icons/dark/Istio.svg',
73+
docsUrl: '/build-your-software-catalog/sync-data-to-catalog/kubernetes-stack/kubernetes/templates/istio',
74+
},
5375
// Project Management
5476
{
5577
name: 'Jira',
5678
category: 'project',
79+
iconName: 'Jira',
80+
icon: '/img/guides/icons/Jira.svg',
81+
darkIcon: '/img/guides/icons/dark/Jira.svg',
82+
docsUrl: '/build-your-software-catalog/sync-data-to-catalog/project-management/jira',
83+
},
84+
{
85+
name: 'Jira server (self-hosted)',
86+
category: 'project',
87+
iconName: 'Jira',
5788
icon: '/img/guides/icons/Jira.svg',
5889
darkIcon: '/img/guides/icons/dark/Jira.svg',
5990
docsUrl: '/build-your-software-catalog/sync-data-to-catalog/project-management/jira',
@@ -74,12 +105,21 @@ export const integrations = [
74105
docsUrl: '/build-your-software-catalog/sync-data-to-catalog/kubernetes-stack/kubernetes',
75106
},
76107
{
77-
name: 'AWS',
108+
name: 'AWS self-hosted',
78109
category: 'cloud-providers',
110+
iconName: 'AWS',
79111
icon: '/img/guides/icons/AWS.svg',
80112
darkIcon: '/img/guides/icons/dark/AWS.svg',
81113
docsUrl: '/build-your-software-catalog/sync-data-to-catalog/cloud-providers/aws',
82114
},
115+
{
116+
name: 'AWS hosted by Port',
117+
category: 'cloud-providers',
118+
iconName: 'AWS',
119+
icon: '/img/guides/icons/AWS.svg',
120+
darkIcon: '/img/guides/icons/dark/AWS.svg',
121+
docsUrl: '/build-your-software-catalog/sync-data-to-catalog/cloud-providers/aws-v3/Overview',
122+
},
83123
{
84124
name: 'Azure',
85125
category: 'cloud-providers',
@@ -145,6 +185,27 @@ export const integrations = [
145185
darkIcon: '/img/guides/icons/dark/SonarQube.svg',
146186
docsUrl: '/build-your-software-catalog/sync-data-to-catalog/code-quality-security/sonarqube',
147187
},
188+
{
189+
name: 'Aikido',
190+
category: 'security',
191+
icon: '/img/guides/icons/Aikido.svg',
192+
darkIcon: '/img/guides/icons/dark/Aikido.svg',
193+
docsUrl: '/build-your-software-catalog/sync-data-to-catalog/code-quality-security/aikido',
194+
},
195+
{
196+
name: 'Checkmarx',
197+
category: 'security',
198+
icon: '/img/guides/icons/Checkmarx.svg',
199+
darkIcon: '/img/guides/icons/dark/Checkmarx.svg',
200+
docsUrl: '/build-your-software-catalog/sync-data-to-catalog/code-quality-security/checkmarx',
201+
},
202+
{
203+
name: 'Armorcode',
204+
category: 'security',
205+
icon: '/img/guides/icons/Armorcode.svg',
206+
darkIcon: '/img/guides/icons/dark/Armorcode.svg',
207+
docsUrl: '/build-your-software-catalog/sync-data-to-catalog/code-quality-security/armorcode',
208+
},
148209
// Feature Management
149210
{
150211
name: 'Launchdarkly',
@@ -232,6 +293,21 @@ export const integrations = [
232293
darkIcon: '/img/guides/icons/dark/Backstage.svg',
233294
docsUrl: '/build-your-software-catalog/sync-data-to-catalog/other/backstage',
234295
},
296+
{
297+
name: 'Okta',
298+
category: 'other',
299+
icon: '/img/guides/icons/Okta.svg',
300+
darkIcon: '/img/guides/icons/dark/Backstage.svg',
301+
docsUrl: '/build-your-software-catalog/sync-data-to-catalog/other/okta',
302+
},
303+
{
304+
name: 'Ocean custom',
305+
category: 'other',
306+
iconName: 'APIcatalog',
307+
icon: '/img/guides/icons/APIcatalog.svg',
308+
darkIcon: '/img/guides/icons/dark/APIcatalog.svg',
309+
docsUrl: '/build-your-software-catalog/custom-integration/ocean-custom-integration/overview',
310+
},
235311
{
236312
name: 'Github Copilot',
237313
category: 'ai-agents',
@@ -258,7 +334,7 @@ export const integrations = [
258334
export const categories = {
259335
'All': 'all',
260336
'Git': 'git',
261-
'Kubernetes': 'kubernetes',
337+
'Kubernetes stack': 'kubernetes',
262338
'Cloud providers': 'cloud-providers',
263339
'IaC': 'iac',
264340
'Incident management': 'incident',

‎src/components/guides-section/LogoImage/LogoImage.jsx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ import { getImagePath } from '/src/components/guides-section/Utils.js';
44
import ThemedImage from '@theme/ThemedImage';
55
import useBaseUrl from '@docusaurus/useBaseUrl';
66

7-
export default function LogoImage({ logo, width, verticalAlign = 'text-top' }) {
8-
const lightSrc = useBaseUrl("/img/guides/icons/" + logo.replace(/ /g, '') + ".svg");
9-
const darkSrc = useBaseUrl(getImagePath(logo));
7+
export default function LogoImage({ logo, iconName, width, verticalAlign = 'text-top' }) {
8+
// Use iconName if provided, otherwise use logo name (with spaces removed)
9+
const iconBaseName = iconName ? iconName.replace(/ /g, '') : logo.replace(/ /g, '');
10+
const lightSrc = useBaseUrl("/img/guides/icons/" + iconBaseName + ".svg");
11+
const darkSrc = useBaseUrl(getImagePath(iconName || logo));
1012

1113
return (
1214
<ThemedImage

‎src/components/guides-section/Utils.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
const darkTags = [ "AWS", "Datadog", "GitHub", "Kafka", "Launchdarkly", "Linear", "Backstage", "Sentry", "User", "Team", "Webhook", "ManageProperties", "entitiesTable", "EditProperty", "Github Copilot", "export" ]
2+
const darkTags = [ "AWS", "Datadog", "GitHub", "Kafka", "Launchdarkly", "Linear", "Backstage", "Sentry", "User", "Team", "Webhook", "ManageProperties", "entitiesTable", "EditProperty", "Github Copilot", "export", "Okta" ]
33

44
export const getImagePath = (image) => {
55
if (darkTags.includes(image)) {

‎static/img/guides/icons/Aikido.svg‎

Lines changed: 5 additions & 0 deletions
Loading

‎static/img/guides/icons/Armorcode.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎static/img/guides/icons/Checkmarx.svg‎

Lines changed: 4 additions & 4 deletions
Loading

‎static/img/guides/icons/Istio.svg‎

Lines changed: 13 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)