Skip to content

Commit 8b9075c

Browse files
update version
2 parents b60400d + 801ba52 commit 8b9075c

File tree

6 files changed

+111
-13
lines changed

6 files changed

+111
-13
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
platform :ios, "14.0"
2+
use_frameworks!
3+
inhibit_all_warnings!
4+
target "Acme" do
5+
6+
# Raizlabs
7+
pod 'RZVinyl', :git =>'[email protected]:test/acme-RZVinyl.git'
8+
pod 'RZTransitions', '1.2.1'
9+
# Acme
10+
pod 'SDWebImage', :git =>'[email protected]:test/acme-SDWebImage.git', :commit => 'c224e87'
11+
12+
# Code Analysis
13+
pod 'SwiftLint'
14+
target 'AcmeTests' do
15+
inherit! :search_paths
16+
pod 'RZVinyl', :git =>'[email protected]:test/acme-RZVinyl.git'
17+
# For UI Snapshot Testing
18+
use_frameworks!
19+
pod 'iOSSnapshotTestCase', '6.2.0'
20+
pod 'SnapshotTesting', '~> 1.8.1'
21+
end
22+
23+
target 'NotificationServiceExtension' do
24+
inherit! :search_paths
25+
end
26+
27+
post_install do |installer|
28+
installer.pods_project.targets.each do |target|
29+
30+
target.build_configurations.each do |config|
31+
config.build_settings['EXPANDED_CODE_SIGN_IDENTITY'] = ""
32+
end
33+
end
34+
end
35+
end

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"clean": "yarn tsc --build --clean",
6060
"lint": "yarn eslint src --ext .ts",
6161
"prepublish": "yarn build",
62-
"test": "yarn mocha './src/**/*.test.ts'",
62+
"test": "yarn mocha './src/**/*.test.ts' --reporter-option maxDiffSize=0",
6363
"script:transcend-json-schema": "ts-node --transpile-only scripts/buildTranscendJsonSchema.ts && yarn prettier ./transcend-yml-schema-v6.json --write",
6464
"script:pathfinder-json-schema": "ts-node --transpile-only scripts/buildPathfinderJsonSchema.ts && yarn prettier ./pathfinder-policy-yml-schema.json --write"
6565
},

src/cli-cron-pull-profiles.ts

+20-10
Original file line numberDiff line numberDiff line change
@@ -131,16 +131,26 @@ async function main(): Promise<void> {
131131
const results = await map(
132132
uniq(requestIds),
133133
async (requestId) => {
134-
const results = await fetchRequestFilesForRequest(client, { requestId });
135-
return results.map(({ fileName, remoteId }) => ({
136-
RecordId: remoteId,
137-
Object: fileName
138-
.replace('.json', '')
139-
.split('/')
140-
.pop()
141-
?.replace(' Information', ''),
142-
Comment: 'Customer data deletion request submitted via transcend.io',
143-
}));
134+
const results = await fetchRequestFilesForRequest(client, {
135+
requestId,
136+
dataSiloId: targetDataSiloId,
137+
});
138+
return results.map(({ fileName, remoteId }) => {
139+
if (!remoteId) {
140+
throw new Error(
141+
`Failed to find remoteId for ${fileName} request: ${requestId}`,
142+
);
143+
}
144+
return {
145+
RecordId: remoteId,
146+
Object: fileName
147+
.replace('.json', '')
148+
.split('/')
149+
.pop()
150+
?.replace(' Information', ''),
151+
Comment: 'Customer data deletion request submitted via transcend.io',
152+
};
153+
});
144154
},
145155
{
146156
concurrency: 10,

src/code-scanning/integrations/cocoaPods.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { CodePackageSdk } from '../../codecs';
44
import { findAllWithRegex } from '@transcend-io/type-utils';
55
import { CodePackageType } from '@transcend-io/privacy-types';
66

7-
const POD_TARGET_REGEX = /target '(.*?)'/;
7+
const POD_TARGET_REGEX = /target ('|")(.*?)('|")/;
88
const POD_PACKAGE_REGEX = /pod ('|")(.*?)('|")(, ('|")~> (.+?)('|")|)/;
99

1010
export const cocoaPods: CodeScanningConfig = {
@@ -16,7 +16,7 @@ export const cocoaPods: CodeScanningConfig = {
1616
const targets = findAllWithRegex(
1717
{
1818
value: new RegExp(POD_TARGET_REGEX, 'g'),
19-
matches: ['name'],
19+
matches: ['quote1', 'name', 'quote2'],
2020
},
2121
fileContents,
2222
);

src/graphql/fetchRequestFilesForRequest.ts

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ export async function fetchRequestFilesForRequest(
2323
filterBy: {
2424
/** Filter by request ID */
2525
requestId: string;
26+
/** Filter by data silo ID */
27+
dataSiloId?: string;
2628
},
2729
): Promise<RequestFile[]> {
2830
const requestFiles: RequestFile[] = [];

src/tests/findCodePackagesInFolder.test.ts

+51
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,57 @@ describe('findCodePackagesInFolder', () => {
129129
relativePath: 'test-requirements-txt/nested-cocoapods/Podfile',
130130
repositoryName: 'transcend-io/cli',
131131
},
132+
{
133+
name: 'Acme',
134+
relativePath: 'test-requirements-txt/nested-cocoapods-2/Podfile',
135+
repositoryName: 'transcend-io/cli',
136+
softwareDevelopmentKits: [
137+
{
138+
name: 'RZVinyl',
139+
version: undefined,
140+
},
141+
{
142+
name: 'RZTransitions',
143+
version: undefined,
144+
},
145+
{
146+
name: 'SDWebImage',
147+
version: undefined,
148+
},
149+
{
150+
name: 'SwiftLint',
151+
version: undefined,
152+
},
153+
],
154+
type: 'COCOA_PODS',
155+
},
156+
{
157+
name: 'AcmeTests',
158+
type: 'COCOA_PODS',
159+
softwareDevelopmentKits: [
160+
{
161+
name: 'RZVinyl',
162+
version: undefined,
163+
},
164+
{
165+
name: 'iOSSnapshotTestCase',
166+
version: undefined,
167+
},
168+
{
169+
name: 'SnapshotTesting',
170+
version: '1.8.1',
171+
},
172+
],
173+
relativePath: 'test-requirements-txt/nested-cocoapods-2/Podfile',
174+
repositoryName: 'transcend-io/cli',
175+
},
176+
{
177+
name: 'NotificationServiceExtension',
178+
relativePath: 'test-requirements-txt/nested-cocoapods-2/Podfile',
179+
repositoryName: 'transcend-io/cli',
180+
softwareDevelopmentKits: [],
181+
type: 'COCOA_PODS',
182+
},
132183
{
133184
name: 'com.yourcompany.yourapp',
134185
softwareDevelopmentKits: [

0 commit comments

Comments
 (0)